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 <j...@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(-)

diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index 63ff468a7986..6bb37027cd70 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -535,10 +535,8 @@ static __init unsigned long check_iommu_size(unsigned long 
aper, u64 aper_size)
        iommu_size -= round_up(a, PMD_PAGE_SIZE) - a;
 
        if (iommu_size < 64*1024*1024) {
-               pr_warning(
-                       "PCI-DMA: Warning: Small IOMMU %luMB."
-                       " Consider increasing the AGP aperture in BIOS\n",
-                               iommu_size >> 20);
+               pr_warn("PCI-DMA: Warning: Small IOMMU %luMB. Consider 
increasing the AGP aperture in BIOS\n",
+                       iommu_size >> 20);
        }
 
        return iommu_size;
@@ -690,8 +688,7 @@ static __init int init_amd_gatt(struct agp_kern_info *info)
 
  nommu:
        /* Should not happen anymore */
-       pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
-              "falling back to iommu=soft.\n");
+       pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU - falling back to 
iommu=soft\n");
        return -1;
 }
 
@@ -756,8 +753,7 @@ int __init gart_iommu_init(void)
            !gart_iommu_aperture ||
            (no_agp && init_amd_gatt(&info) < 0)) {
                if (max_pfn > MAX_DMA32_PFN) {
-                       pr_warning("More than 4GB of memory but GART IOMMU not 
available.\n");
-                       pr_warning("falling back to iommu=soft.\n");
+                       pr_warn("More than 4GB of memory but GART IOMMU not 
available - falling back to iommu=soft\n");
                }
                return 0;
        }
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 4261b3282ad9..37e9129da8b3 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -685,8 +685,8 @@ calibrate_by_pmtimer(long deltapm, long *delta, long 
*deltatsc)
 
        res = (((u64)deltapm) *  mult) >> 22;
        do_div(res, 1000000);
-       pr_warning("APIC calibration not consistent "
-                  "with PM-Timer: %ldms instead of 100ms\n",(long)res);
+       pr_warn("APIC calibration not consistent with PM-Timer: %ldms instead 
of 100ms\n",
+               (long)res);
 
        /* Correct the lapic counter value */
        res = (((u64)(*delta)) * pm_100ms);
@@ -805,7 +805,7 @@ static int __init calibrate_APIC_clock(void)
         */
        if (lapic_timer_frequency < (1000000 / HZ)) {
                local_irq_enable();
-               pr_warning("APIC frequency too slow, disabling apic timer\n");
+               pr_warn("APIC frequency too slow, disabling apic timer\n");
                return -1;
        }
 
@@ -848,8 +848,8 @@ static int __init calibrate_APIC_clock(void)
        local_irq_enable();
 
        if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
-               pr_warning("APIC timer disabled due to verification failure\n");
-                       return -1;
+               pr_warn("APIC timer disabled due to verification failure\n");
+               return -1;
        }
 
        return 0;
@@ -923,7 +923,7 @@ static void local_apic_timer_interrupt(void)
         * spurious.
         */
        if (!evt->event_handler) {
-               pr_warning("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
+               pr_warn("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
                /* Switch it off */
                lapic_timer_shutdown(evt);
                return;
@@ -1503,11 +1503,11 @@ static int __init setup_nox2apic(char *str)
                int apicid = native_apic_msr_read(APIC_ID);
 
                if (apicid >= 255) {
-                       pr_warning("Apicid: %08x, cannot enforce nox2apic\n",
-                                  apicid);
+                       pr_warn("Apicid: %08x, cannot enforce nox2apic\n",
+                               apicid);
                        return 0;
                }
-               pr_warning("x2apic already enabled.\n");
+               pr_warn("x2apic already enabled\n");
                __x2apic_disable();
        }
        setup_clear_cpu_cap(X86_FEATURE_X2APIC);
@@ -1684,7 +1684,7 @@ static int __init apic_verify(void)
         */
        features = cpuid_edx(1);
        if (!(features & (1 << X86_FEATURE_APIC))) {
-               pr_warning("Could not enable APIC!\n");
+               pr_warn("Could not enable APIC!\n");
                return -1;
        }
        set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
@@ -2102,9 +2102,8 @@ int __generic_processor_info(int apicid, int version, 
bool enabled)
            disabled_cpu_apicid == apicid) {
                int thiscpu = num_processors + disabled_cpus;
 
-               pr_warning("APIC: Disabling requested cpu."
-                          " Processor %d/0x%x ignored.\n",
-                          thiscpu, apicid);
+               pr_warn("APIC: Disabling requested cpu - Processor %d/0x%x 
ignored\n",
+                       thiscpu, apicid);
 
                disabled_cpus++;
                return -ENODEV;
@@ -2118,10 +2117,8 @@ int __generic_processor_info(int apicid, int version, 
bool enabled)
            apicid != boot_cpu_physical_apicid) {
                int thiscpu = max + disabled_cpus - 1;
 
-               pr_warning(
-                       "APIC: NR_CPUS/possible_cpus limit of %i almost"
-                       " reached. Keeping one slot for boot cpu."
-                       "  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
+               pr_warn("APIC: NR_CPUS/possible_cpus limit of %i almost 
reached. Keeping one slot for boot cpu. Processor %d/0x%x ignored.\n",
+                       max, thiscpu, apicid);
 
                disabled_cpus++;
                return -ENODEV;
@@ -2131,9 +2128,8 @@ int __generic_processor_info(int apicid, int version, 
bool enabled)
                int thiscpu = max + disabled_cpus;
 
                if (enabled) {
-                       pr_warning("APIC: NR_CPUS/possible_cpus limit of %i "
-                                  "reached. Processor %d/0x%x ignored.\n",
-                                  max, thiscpu, apicid);
+                       pr_warn("APIC: NR_CPUS/possible_cpus limit of %i 
reached. Processor %d/0x%x ignored.\n",
+                               max, thiscpu, apicid);
                }
 
                disabled_cpus++;
@@ -2164,13 +2160,13 @@ int __generic_processor_info(int apicid, int version, 
bool enabled)
         * Validate version
         */
        if (version == 0x0) {
-               pr_warning("BIOS bug: APIC version is 0 for CPU %d/0x%x, fixing 
up to 0x10\n",
-                          cpu, apicid);
+               pr_warn("BIOS bug: APIC version is 0 for CPU %d/0x%x, fixing up 
to 0x10\n",
+                       cpu, apicid);
                version = 0x10;
        }
 
        if (version != boot_cpu_apic_version) {
-               pr_warning("BIOS bug: APIC version mismatch, boot CPU: %x, CPU 
%d: version %x\n",
+               pr_warn("BIOS bug: APIC version mismatch, boot CPU: %x, CPU %d: 
version %x\n",
                        boot_cpu_apic_version, cpu, version);
        }
 
@@ -2625,8 +2621,8 @@ static int __init apic_set_verbosity(char *arg)
        else if (strcmp("verbose", arg) == 0)
                apic_verbosity = APIC_VERBOSE;
        else {
-               pr_warning("APIC Verbosity level %s not recognised"
-                       " use apic=verbose or apic=debug\n", arg);
+               pr_warn("APIC Verbosity level %s not recognised use 
apic=verbose or apic=debug\n",
+                       arg);
                return -EINVAL;
        }
 
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index b109e4389c92..47b6e5a0b574 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -93,7 +93,7 @@ static void noop_vector_allocation_domain(int cpu, struct 
cpumask *retmask,
                                          const struct cpumask *mask)
 {
        if (cpu != 0)
-               pr_warning("APIC: Vector allocated for non-BSP cpu\n");
+               pr_warn("APIC: Vector allocated for non-BSP cpu\n");
        cpumask_copy(retmask, cpumask_of(cpu));
 }
 
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 9820d6d977c6..e04562c44134 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -207,8 +207,8 @@ void __init setup_per_cpu_areas(void)
                                            pcpu_cpu_distance,
                                            pcpu_fc_alloc, pcpu_fc_free);
                if (rc < 0)
-                       pr_warning("%s allocator failed (%d), falling back to 
page size\n",
-                                  pcpu_fc_names[pcpu_chosen_fc], rc);
+                       pr_warn("%s allocator failed (%d), falling back to page 
size\n",
+                               pcpu_fc_names[pcpu_chosen_fc], rc);
        }
        if (rc < 0)
                rc = pcpu_page_first_chunk(PERCPU_FIRST_CHUNK_RESERVE,
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index b868fa1b812b..a6b57d8d0b9b 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -70,7 +70,7 @@ void __init tboot_probe(void)
         */
        if (!e820_any_mapped(boot_params.tboot_addr,
                             boot_params.tboot_addr, E820_RESERVED)) {
-               pr_warning("non-0 tboot_addr but it is not of type 
E820_RESERVED\n");
+               pr_warn("non-0 tboot_addr but it is not of type 
E820_RESERVED\n");
                return;
        }
 
@@ -78,13 +78,12 @@ void __init tboot_probe(void)
        set_fixmap(FIX_TBOOT_BASE, boot_params.tboot_addr);
        tboot = (struct tboot *)fix_to_virt(FIX_TBOOT_BASE);
        if (memcmp(&tboot_uuid, &tboot->uuid, sizeof(tboot->uuid))) {
-               pr_warning("tboot at 0x%llx is invalid\n",
-                          boot_params.tboot_addr);
+               pr_warn("tboot at 0x%llx is invalid\n", boot_params.tboot_addr);
                tboot = NULL;
                return;
        }
        if (tboot->version < 5) {
-               pr_warning("tboot version is invalid: %u\n", tboot->version);
+               pr_warn("tboot version is invalid: %u\n", tboot->version);
                tboot = NULL;
                return;
        }
@@ -287,7 +286,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, 
u32 pm1b_control)
 
        if (sleep_state >= ACPI_S_STATE_COUNT ||
            acpi_shutdown_map[sleep_state] == -1) {
-               pr_warning("unsupported sleep state 0x%x\n", sleep_state);
+               pr_warn("unsupported sleep state 0x%x\n", sleep_state);
                return -1;
        }
 
@@ -300,7 +299,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, 
u32 val_b)
        if (!tboot_enabled())
                return 0;
 
-       pr_warning("tboot is not able to suspend on platforms with reduced 
hardware sleep (ACPIv5)");
+       pr_warn("tboot is not able to suspend on platforms with reduced 
hardware sleep (ACPIv5)\n");
        return -ENODEV;
 }
 
@@ -318,7 +317,7 @@ static int tboot_wait_for_aps(int num_aps)
        }
 
        if (timeout)
-               pr_warning("tboot wait for APs timeout\n");
+               pr_warn("tboot wait for APs timeout\n");
 
        return !(atomic_read((atomic_t *)&tboot->num_in_wfs) == num_aps);
 }
@@ -511,7 +510,7 @@ int tboot_force_iommu(void)
                return 0;
 
        if (no_iommu || swiotlb || dmar_disabled)
-               pr_warning("Forcing Intel-IOMMU to enabled\n");
+               pr_warn("Forcing Intel-IOMMU to enabled\n");
 
        dmar_disabled = 0;
 #ifdef CONFIG_SWIOTLB
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 728f75378475..61de4fbf8f45 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -332,12 +332,12 @@ void check_tsc_sync_source(int cpu)
                /* Force it to 0 if random warps brought us here */
                atomic_set(&test_runs, 0);
 
-               pr_warning("TSC synchronization [CPU#%d -> CPU#%d]:\n",
+               pr_warn("TSC synchronization [CPU#%d -> CPU#%d]:\n",
                        smp_processor_id(), cpu);
-               pr_warning("Measured %Ld cycles TSC warp between CPUs, "
-                          "turning off TSC clock.\n", max_warp);
+               pr_warn("Measured %lld cycles TSC warp between CPUs, turning 
off TSC clock\n",
+                       max_warp);
                if (random_warps)
-                       pr_warning("TSC warped randomly between CPUs\n");
+                       pr_warn("TSC warped randomly between CPUs\n");
                mark_tsc_unstable("check_tsc_sync_source failed");
        }
 
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/numa.c b/arch/x86/mm/numa.c
index 12dcad7297a5..3aa236f0a2fb 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -136,8 +136,8 @@ static int __init numa_add_memblk_to(int nid, u64 start, 
u64 end,
 
        /* whine about and ignore invalid blks */
        if (start > end || nid < 0 || nid >= MAX_NUMNODES) {
-               pr_warning("NUMA: Warning: invalid memblk node %d [mem 
%#010Lx-%#010Lx]\n",
-                          nid, start, end - 1);
+               pr_warn("NUMA: Warning: invalid memblk node %d [mem 
%#010Lx-%#010Lx]\n",
+                       nid, start, end - 1);
                return 0;
        }
 
@@ -272,9 +272,9 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
                                               bj->nid, bj->start, bj->end - 1);
                                        return -EINVAL;
                                }
-                               pr_warning("NUMA: Warning: node %d [mem 
%#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",
-                                          bi->nid, bi->start, bi->end - 1,
-                                          bj->start, bj->end - 1);
+                               pr_warn("NUMA: Warning: node %d [mem 
%#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",
+                                       bi->nid, bi->start, bi->end - 1,
+                                       bj->start, bj->end - 1);
                        }
 
                        /*
@@ -364,7 +364,7 @@ static int __init numa_alloc_distance(void)
        phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
                                      size, PAGE_SIZE);
        if (!phys) {
-               pr_warning("NUMA: Warning: can't allocate distance table!\n");
+               pr_warn("NUMA: Warning: can't allocate distance table!\n");
                /* don't retry until explicitly reset */
                numa_distance = (void *)1LU;
                return -ENOMEM;
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index a8f90ce3dedf..a6446ad3cd32 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -349,7 +349,7 @@ void __init numa_emulation(struct numa_meminfo 
*numa_meminfo, int numa_dist_cnt)
                goto no_emu;
 
        if (numa_cleanup_meminfo(&ei) < 0) {
-               pr_warning("NUMA: Warning: constructed meminfo invalid, 
disabling emulation\n");
+               pr_warn("NUMA: Warning: constructed meminfo invalid, disabling 
emulation\n");
                goto no_emu;
        }
 
@@ -360,7 +360,7 @@ void __init numa_emulation(struct numa_meminfo 
*numa_meminfo, int numa_dist_cnt)
                phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
                                              phys_size, PAGE_SIZE);
                if (!phys) {
-                       pr_warning("NUMA: Warning: can't allocate copy of 
distance table, disabling emulation\n");
+                       pr_warn("NUMA: Warning: can't allocate copy of distance 
table, disabling emulation\n");
                        goto no_emu;
                }
                memblock_reserve(phys, phys_size);
@@ -386,7 +386,7 @@ void __init numa_emulation(struct numa_meminfo 
*numa_meminfo, int numa_dist_cnt)
                }
        }
        if (dfl_phys_nid == NUMA_NO_NODE) {
-               pr_warning("NUMA: Warning: can't determine default physical 
node, disabling emulation\n");
+               pr_warn("NUMA: Warning: can't determine default physical node, 
disabling emulation\n");
                goto no_emu;
        }
 
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");
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index 71e8a67337e2..276cf79b5d24 100644
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -67,13 +67,13 @@ static inline void op_x86_warn_in_use(int counter)
         * cannot be monitored by any other counter, contact your
         * hardware or BIOS vendor.
         */
-       pr_warning("oprofile: counter #%d on cpu #%d may already be used\n",
-                  counter, smp_processor_id());
+       pr_warn("oprofile: counter #%d on cpu #%d may already be used\n",
+               counter, smp_processor_id());
 }
 
 static inline void op_x86_warn_reserved(int counter)
 {
-       pr_warning("oprofile: counter #%d is already reserved\n", counter);
+       pr_warn("oprofile: counter #%d is already reserved\n", counter);
 }
 
 extern u64 op_x86_get_ctrl(struct op_x86_model_spec const *model,
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c 
b/arch/x86/platform/olpc/olpc-xo15-sci.c
index c0533fbc39e3..e46c73ba3b44 100644
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -43,7 +43,7 @@ static int set_lid_wake_behavior(bool wake_on_close)
 
        status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", 
wake_on_close);
        if (ACPI_FAILURE(status)) {
-               pr_warning(PFX "failed to set lid behavior\n");
+               pr_warn(PFX "failed to set lid behavior\n");
                return 1;
        }
 
diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c
index 6c7111bbd1e9..530655e8405e 100644
--- a/arch/x86/platform/sfi/sfi.c
+++ b/arch/x86/platform/sfi/sfi.c
@@ -39,8 +39,7 @@ static unsigned long sfi_lapic_addr __initdata = 
APIC_DEFAULT_PHYS_BASE;
 static void __init mp_sfi_register_lapic(u8 id)
 {
        if (MAX_LOCAL_APIC - id <= 0) {
-               pr_warning("Processor #%d invalid (max %d)\n",
-                       id, MAX_LOCAL_APIC);
+               pr_warn("Processor #%d invalid (max %d)\n", id, MAX_LOCAL_APIC);
                return;
        }
 
diff --git a/arch/x86/xen/debugfs.c b/arch/x86/xen/debugfs.c
index 1daff5545c0a..358f92da8d9e 100644
--- a/arch/x86/xen/debugfs.c
+++ b/arch/x86/xen/debugfs.c
@@ -12,7 +12,7 @@ struct dentry * __init xen_init_debugfs(void)
                d_xen_debug = debugfs_create_dir("xen", NULL);
 
                if (!d_xen_debug)
-                       pr_warning("Could not create 'xen' debugfs 
directory\n");
+                       pr_warn("Could not create 'xen' debugfs directory\n");
        }
 
        return d_xen_debug;
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index a8c306cf8868..b92e924b9464 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -413,7 +413,7 @@ static unsigned long __init 
xen_set_identity_and_remap_chunk(
 
                remap_range_size = xen_find_pfn_range(&remap_pfn);
                if (!remap_range_size) {
-                       pr_warning("Unable to find available pfn range, not 
remapping identity pages\n");
+                       pr_warn("Unable to find available pfn range, not 
remapping identity pages\n");
                        xen_set_identity_and_release_chunk(cur_pfn,
                                                cur_pfn + left, nr_pages);
                        break;
-- 
2.10.0.rc2.1.g053435c

Reply via email to