Subject: + arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch added to -mm tree To: fabf@xxxxxxxxx,gxt@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 06 May 2014 13:47:39 -0700 The patch titled Subject: arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn(1 has been added to the -mm tree. Its filename is arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn(1 +coalesce formats Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> Cc: Guan Xuetao <gxt@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/unicore32/mm/ioremap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff -puN arch/unicore32/mm/ioremap.c~arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1 arch/unicore32/mm/ioremap.c --- a/arch/unicore32/mm/ioremap.c~arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1 +++ a/arch/unicore32/mm/ioremap.c @@ -143,13 +143,8 @@ void __iomem *__uc32_ioremap_pfn_caller( /* * Don't allow RAM to be mapped */ - if (pfn_valid(pfn)) { - printk(KERN_WARNING "BUG: Your driver calls ioremap() on\n" - "system memory. This leads to architecturally\n" - "unpredictable behaviour, and ioremap() will fail in\n" - "the next kernel release. Please fix your driver.\n"); - WARN_ON(1); - } + if (pfn_valid(pfn)) + WARN(1, "BUG: Your driver calls ioremap() on\nsystem memory. This leads to architecturally\nunpredictable behaviour, and ioremap() will fail in\nthe next kernel release. Please fix your driver.\n"); type = get_mem_type(mtype); if (!type) _ Patches currently in -mm which might be from fabf@xxxxxxxxx are origin.patch fs-affs-superc-bugfix-double-free.patch fs-ceph-replace-pr_warning-by-pr_warn.patch fs-ceph-debugfsc-replace-seq_printf-by-seq_puts.patch fs-cifs-remove-obsolete-__constant.patch fs-jfs-jfs_logmgrc-remove-null-assignment-on-static.patch fs-jfs-superc-remove-0-assignement-to-static-code-clean-up.patch fs-fscache-convert-printk-to-pr_foo.patch fs-fscache-replace-seq_printf-by-seq_puts.patch ntfs-remove-null-value-assignments.patch fs-squashfs-squashfsh-replace-pr_warning-by-pr_warn.patch fs-configs-itemc-kernel-doc-fixes-clean-up.patch ocfs2-remove-null-assignments-on-static.patch fs-ocfs2-superc-use-ocfs2_max_vol_label_len-and-strlcpy.patch fs-9p-v9fsc-add-__init-to-v9fs_sysfs_init.patch fs-9p-kerneldoc-fixes.patch mm-slubc-convert-printk-to-pr_foo.patch mm-slubc-convert-vnsprintf-static-to-va_format.patch mm-memory_hotplugc-use-pfn_down.patch mm-memblockc-use-pfn_down.patch mm-memcontrolc-remove-null-assignment-on-static.patch mm-vmallocc-replace-seq_printf-by-seq_puts.patch mm-mempolicyc-parameter-doc-uniformization.patch mm-zbudc-make-size-unsigned-like-unique-callsite.patch sys_sgetmask-sys_ssetmask-add-config_sgetmask_syscall.patch kernel-cpuc-convert-printk-to-pr_foo.patch kernel-backtracetestc-replace-no-level-printk-by-pr_info.patch kernel-capabilityc-code-clean-up.patch kernel-exec_domainc-code-clean-up.patch lib-libcrc32cc-use-ptr_err_or_zero.patch lib-vsprintfc-fix-comparison-to-bool.patch kernel-compatc-use-sizeof-instead-of-sizeof.patch fs-binfmt_elfc-fix-bool-assignements.patch fs-autofs4-dev-ioctlc-add-__init-to-autofs_dev_ioctl_init.patch fs-befs-linuxvfsc-replace-strncpy-by-strlcpy.patch fs-befs-btreec-replace-strncpy-by-strlcpy-coding-style-fixing.patch fs-befs-linuxvfsc-remove-positive-test-on-sector_t.patch fs-befs-kernel-doc-fixes.patch fs-isofs-logging-clean-up.patch fs-ufs-ballocc-remove-err-parameter-in-ufs_add_fragments.patch fs-reiserfs-bitmapc-coding-style-fixes.patch fs-reiserfs-streec-remove-obsolete-__constant.patch kernel-cpusetc-kernel-doc-fixes.patch kernel-cpusetc-convert-printk-to-pr_foo.patch kernel-kexecc-convert-printk-to-pr_foo.patch fs-affs-filec-remove-unnecessary-function-parameters.patch fs-affs-convert-printk-to-pr_foo.patch fs-affs-pr_debug-cleanup.patch fs-pstore-logging-clean-up.patch fs-pstore-logging-clean-up-fix.patch linux-next.patch init-mainc-code-clean-up.patch ufs-sb-mutex-merge-mutex_destroy.patch arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1-fix.patch kernel-kprobesc-convert-printk-to-pr_foo.patch kernel-latencytopc-convert-seq_printf-to-seq_puts.patch kernel-posix-timersc-code-clean-up.patch kernel-profilec-convert-printk-to-pr_foo.patch kernel-rcu-treec-make-rcu-node-arrays-static-const-char-const.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html