lkml.org 
[lkml]   [2017]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
On Thu, 16 Feb 2017 23:11:22 -0800
Joe Perches <joe@perches.com> wrote:

> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for arch/x86
>
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
>
> Miscellanea:
>
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> arch/x86/kernel/amd_gart_64.c | 12 +++------
> arch/x86/kernel/apic/apic.c | 46 ++++++++++++++++------------------
> arch/x86/kernel/apic/apic_noop.c | 2 +-
> arch/x86/kernel/setup_percpu.c | 4 +--
> arch/x86/kernel/tboot.c | 15 ++++++-----
> arch/x86/kernel/tsc_sync.c | 8 +++---
> arch/x86/mm/kmmio.c | 8 +++---
> arch/x86/mm/mmio-mod.c | 5 ++--
> arch/x86/mm/numa.c | 12 ++++-----
> arch/x86/mm/numa_emulation.c | 6 ++---
> arch/x86/mm/testmmiotrace.c | 5 ++--
> arch/x86/oprofile/op_x86_model.h | 6 ++---
> arch/x86/platform/olpc/olpc-xo15-sci.c | 2 +-
> arch/x86/platform/sfi/sfi.c | 3 +--
> arch/x86/xen/debugfs.c | 2 +-
> arch/x86/xen/setup.c | 2 +-
> 16 files changed, 63 insertions(+), 75 deletions(-)
>

Hi,

seems fine to me, even though I haven't been involved in the kernel
side for years.

For the hunks quoted below *only*:
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

> diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
> index afc47f5c9531..ad70518cdcc7 100644
> --- a/arch/x86/mm/kmmio.c
> +++ b/arch/x86/mm/kmmio.c
> @@ -187,8 +187,8 @@ static int arm_kmmio_fault_page(struct kmmio_fault_page *f)
> int ret;
> WARN_ONCE(f->armed, KERN_ERR pr_fmt("kmmio page already armed.\n"));
> if (f->armed) {
> - pr_warning("double-arm: addr 0x%08lx, ref %d, old %d\n",
> - f->addr, f->count, !!f->old_presence);
> + pr_warn("double-arm: addr 0x%08lx, ref %d, old %d\n",
> + f->addr, f->count, !!f->old_presence);
> }
> ret = clear_page_presence(f, true);
> WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming at 0x%08lx failed.\n"),
> @@ -335,8 +335,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
> * something external causing them (f.e. using a debugger while
> * mmio tracing enabled), or erroneous behaviour
> */
> - pr_warning("unexpected debug trap on CPU %d.\n",
> - smp_processor_id());
> + pr_warn("unexpected debug trap on CPU %d\n",
> + smp_processor_id());
> goto out;
> }
>
> diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
> index bef36622e408..706ae44d1af7 100644
> --- a/arch/x86/mm/mmio-mod.c
> +++ b/arch/x86/mm/mmio-mod.c
> @@ -407,7 +407,7 @@ static void enter_uniprocessor(void)
> }
> out:
> if (num_online_cpus() > 1)
> - pr_warning("multiple CPUs still online, may miss events.\n");
> + pr_warn("multiple CPUs still online, may miss events\n");
> }
>
> static void leave_uniprocessor(void)
> @@ -431,8 +431,7 @@ static void leave_uniprocessor(void)
> static void enter_uniprocessor(void)
> {
> if (num_online_cpus() > 1)
> - pr_warning("multiple CPUs are online, may miss events. "
> - "Suggest booting with maxcpus=1 kernel argument.\n");
> + pr_warn("multiple CPUs are online, may miss events. Suggest booting with maxcpus=1 kernel argument.\n");
> }
>
> static void leave_uniprocessor(void)

> diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c
> index 38868adf07ea..4a55e453296d 100644
> --- a/arch/x86/mm/testmmiotrace.c
> +++ b/arch/x86/mm/testmmiotrace.c
> @@ -121,9 +121,8 @@ static int __init init(void)
> return -ENXIO;
> }
>
> - pr_warning("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, "
> - "and writing 16 kB of rubbish in there.\n",
> - size >> 10, mmio_address);
> + pr_warn("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, and writing 16 kB of rubbish in there\n",
> + size >> 10, mmio_address);
> do_test(size);
> do_test_bulk_ioremapping();
> pr_info("All done.\n");


Thanks,
pq
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2017-02-17 08:47    [W:0.382 / U:0.952 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site