Messages in this thread Patch in this message | | | From | Chen Yucong <> | Subject | [PATCH] arch/x86: convert all printk(KERN_INFO ) to pr_info() | Date | Mon, 22 Feb 2016 16:21:40 +0800 |
| |
arch/x86/* use a mixture of printk(KERN_INFO ) and pr_info(). This patch converts all of printk(KERN_INFO ) to pr_info() for arch/x86 directory.
Signed-off-by: Chen Yucong <slaoub@gmail.com> --- arch/x86/crypto/blowfish_glue.c | 5 +--- arch/x86/crypto/camellia_glue.c | 5 +--- arch/x86/crypto/serpent_sse2_glue.c | 2 +- arch/x86/crypto/twofish_glue_3way.c | 5 +--- arch/x86/include/asm/gart.h | 8 ++--- arch/x86/kernel/acpi/boot.c | 22 +++++++------- arch/x86/kernel/acpi/sleep.c | 2 +- arch/x86/kernel/apb_timer.c | 11 ++++--- arch/x86/kernel/apic/apic.c | 12 ++++---- arch/x86/kernel/apic/bigsmp_32.c | 5 ++-- arch/x86/kernel/apic/io_apic.c | 34 ++++++++++----------- arch/x86/kernel/apic/probe_32.c | 8 ++--- arch/x86/kernel/apic/x2apic_uv_x.c | 4 +-- arch/x86/kernel/apm_32.c | 57 ++++++++++++++++-------------------- arch/x86/kernel/bootflag.c | 2 +- arch/x86/kernel/check.c | 7 +++-- arch/x86/kernel/cpuid.c | 4 +-- arch/x86/kernel/e820.c | 27 ++++++++--------- arch/x86/kernel/early-quirks.c | 38 +++++++++--------------- arch/x86/kernel/fpu/init.c | 3 +- arch/x86/kernel/fpu/xstate.c | 3 +- arch/x86/kernel/hpet.c | 23 +++++++-------- arch/x86/kernel/i8259.c | 2 +- arch/x86/kernel/kprobes/core.c | 12 ++++---- arch/x86/kernel/kvm.c | 10 +++---- arch/x86/kernel/kvmclock.c | 10 +++---- arch/x86/kernel/mmconf-fam10h_64.c | 2 +- arch/x86/kernel/paravirt.c | 3 +- arch/x86/kernel/pci-calgary_64.c | 23 +++++++-------- arch/x86/kernel/pci-swiotlb.c | 3 +- arch/x86/kernel/quirks.c | 3 +- arch/x86/kernel/setup.c | 15 +++++----- arch/x86/kernel/smpboot.c | 10 +++---- arch/x86/kernel/sysfb_efi.c | 7 ++--- arch/x86/kernel/test_nx.c | 2 +- arch/x86/kernel/vsmp_64.c | 4 +-- arch/x86/kvm/assigned-dev.c | 21 +++++++------ arch/x86/kvm/cpuid.c | 2 +- arch/x86/kvm/irq_comm.c | 2 +- arch/x86/kvm/lapic.c | 6 ++-- arch/x86/kvm/svm.c | 8 ++--- arch/x86/kvm/vmx.c | 8 ++--- arch/x86/kvm/x86.c | 4 +-- arch/x86/lguest/boot.c | 2 +- arch/x86/mm/highmem_32.c | 4 +-- arch/x86/mm/init.c | 2 +- arch/x86/mm/init_32.c | 23 +++++++-------- arch/x86/mm/init_64.c | 8 ++--- arch/x86/mm/kmemcheck/kmemcheck.c | 7 ++--- arch/x86/mm/numa.c | 14 ++++----- arch/x86/mm/numa_32.c | 3 +- arch/x86/mm/numa_emulation.c | 4 +-- arch/x86/mm/pageattr-test.c | 7 ++--- arch/x86/mm/pgtable.c | 4 +-- arch/x86/mm/setup_nx.c | 6 ++-- arch/x86/mm/srat.c | 17 ++++++----- arch/x86/oprofile/nmi_int.c | 10 +++---- arch/x86/oprofile/op_model_amd.c | 2 +- arch/x86/pci/acpi.c | 13 ++++---- arch/x86/pci/amd_bus.c | 4 +-- arch/x86/pci/broadcom_bus.c | 4 +-- arch/x86/pci/common.c | 14 ++++----- arch/x86/pci/direct.c | 6 ++-- arch/x86/pci/early.c | 3 +- arch/x86/pci/irq.c | 8 ++--- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 6 ++-- arch/x86/pci/xen.c | 4 +-- arch/x86/platform/geode/alix.c | 9 +++--- arch/x86/platform/geode/geos.c | 4 +-- arch/x86/platform/geode/net5501.c | 4 +-- arch/x86/platform/iris/iris.c | 4 +-- arch/x86/platform/olpc/olpc-xo1-pm.c | 4 +-- arch/x86/platform/olpc/olpc_ofw.c | 2 +- arch/x86/platform/uv/bios_uv.c | 2 +- arch/x86/platform/uv/tlb_uv.c | 2 +- arch/x86/platform/uv/uv_time.c | 8 ++--- arch/x86/um/sysrq_64.c | 30 +++++++++---------- arch/x86/um/tls_32.c | 4 +-- arch/x86/xen/enlighten.c | 9 +++--- arch/x86/xen/platform-pci-unplug.c | 12 ++++---- arch/x86/xen/setup.c | 2 +- arch/x86/xen/time.c | 5 ++-- 85 files changed, 332 insertions(+), 394 deletions(-)
diff --git a/arch/x86/crypto/blowfish_glue.c b/arch/x86/crypto/blowfish_glue.c index 17c0553..f8769cc 100644 --- a/arch/x86/crypto/blowfish_glue.c +++ b/arch/x86/crypto/blowfish_glue.c @@ -458,10 +458,7 @@ MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); static int __init init(void) { if (!force && is_blacklisted_cpu()) { - printk(KERN_INFO - "blowfish-x86_64: performance on this CPU " - "would be suboptimal: disabling " - "blowfish-x86_64.\n"); + pr_info("blowfish-x86_64: performance on this CPU would be suboptimal: disabling blowfish-x86_64.\n"); return -ENODEV; } diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c index aa76cad..aeeabf0 100644 --- a/arch/x86/crypto/camellia_glue.c +++ b/arch/x86/crypto/camellia_glue.c @@ -1701,10 +1701,7 @@ MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); static int __init init(void) { if (!force && is_blacklisted_cpu()) { - printk(KERN_INFO - "camellia-x86_64: performance on this CPU " - "would be suboptimal: disabling " - "camellia-x86_64.\n"); + pr_info("camellia-x86_64: performance on this CPU would be suboptimal: disabling camellia-x86_64.\n"); return -ENODEV; } diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c index 8943407..3f7a870 100644 --- a/arch/x86/crypto/serpent_sse2_glue.c +++ b/arch/x86/crypto/serpent_sse2_glue.c @@ -601,7 +601,7 @@ static struct crypto_alg serpent_algs[10] = { { static int __init serpent_sse2_init(void) { if (!cpu_has_xmm2) { - printk(KERN_INFO "SSE2 instructions are not detected.\n"); + pr_info("SSE2 instructions are not detected.\n"); return -ENODEV; } diff --git a/arch/x86/crypto/twofish_glue_3way.c b/arch/x86/crypto/twofish_glue_3way.c index 2ebb5e9..64dcbd3 100644 --- a/arch/x86/crypto/twofish_glue_3way.c +++ b/arch/x86/crypto/twofish_glue_3way.c @@ -471,10 +471,7 @@ MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); static int __init init(void) { if (!force && is_blacklisted_cpu()) { - printk(KERN_INFO - "twofish-x86_64-3way: performance on this CPU " - "would be suboptimal: disabling " - "twofish-x86_64-3way.\n"); + pr_info("twofish-x86_64-3way: performance on this CPU would be suboptimal: disabling twofish-x86_64-3way.\n"); return -ENODEV; } diff --git a/arch/x86/include/asm/gart.h b/arch/x86/include/asm/gart.h index 156cd5d..e1cc25b 100644 --- a/arch/x86/include/asm/gart.h +++ b/arch/x86/include/asm/gart.h @@ -94,16 +94,16 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) return 0; if (aper_base + aper_size > 0x100000000ULL) { - printk(KERN_INFO "Aperture beyond 4GB. Ignoring.\n"); + pr_info("Aperture beyond 4GB. Ignoring.\n"); return 0; } if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { - printk(KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n"); + pr_info("Aperture pointing to e820 RAM. Ignoring.\n"); return 0; } if (aper_size < min_size) { - printk(KERN_INFO "Aperture too small (%d MB) than (%d MB)\n", - aper_size>>20, min_size>>20); + pr_info("Aperture too small (%d MB) than (%d MB)\n", + aper_size>>20, min_size>>20); return 0; } diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index e759076..b8bf5cf 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -57,6 +57,9 @@ EXPORT_SYMBOL(acpi_disabled); #define PREFIX "ACPI: " +#undef pr_fmt +#define pr_fmt(fmt) "ACPI: " fmt + int acpi_noirq; /* skip ACPI IRQ initialization */ int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */ EXPORT_SYMBOL(acpi_pci_disabled); @@ -170,7 +173,7 @@ static int acpi_register_lapic(int id, u8 enabled) unsigned int ver = 0; if (id >= MAX_LOCAL_APIC) { - printk(KERN_INFO PREFIX "skipped apicid that is too big\n"); + pr_info("skipped apicid that is too big\n"); return -EINVAL; } @@ -717,7 +720,7 @@ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu) cpu = acpi_register_lapic(physid, ACPI_MADT_ENABLED); if (cpu < 0) { - pr_info(PREFIX "Unable to map lapic to logical cpu number\n"); + pr_info("Unable to map lapic to logical cpu number\n"); return cpu; } @@ -872,8 +875,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) hpet_address >>= 32; } #endif - printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n", - hpet_tbl->id, hpet_address); + pr_info("HPET id: %#x base: %#lx\n", hpet_tbl->id, hpet_address); /* * Allocate and initialize the HPET firmware resource for adding into @@ -935,8 +937,7 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) pmtmr_ioport = acpi_gbl_FADT.pm_timer_block; } if (pmtmr_ioport) - printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", - pmtmr_ioport); + pr_info("PM-Timer IO Port: %#x\n", pmtmr_ioport); #endif return 0; } @@ -1132,8 +1133,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) * if "noapic" boot option, don't look for IO-APICs */ if (skip_ioapic_setup) { - printk(KERN_INFO PREFIX "Skipping IOAPIC probe " - "due to 'noapic' option.\n"); + pr_info("Skipping IOAPIC probe due to 'noapic' option.\n"); return -ENODEV; } @@ -1263,11 +1263,9 @@ static void __init acpi_process_madt(void) * processors, where MPS only supports physical. */ if (acpi_lapic && acpi_ioapic) - printk(KERN_INFO "Using ACPI (MADT) for SMP configuration " - "information\n"); + pr_info("Using ACPI (MADT) for SMP configuration information\n"); else if (acpi_lapic) - printk(KERN_INFO "Using ACPI for processor (LAPIC) " - "configuration information\n"); + pr_info("Using ACPI for processor (LAPIC) configuration information\n"); #endif return; } diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index d1daead..a850963 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -48,7 +48,7 @@ int x86_acpi_suspend_lowlevel(void) (struct wakeup_header *) __va(real_mode_header->wakeup_header); if (header->signature != WAKEUP_HEADER_SIGNATURE) { - printk(KERN_ERR "wakeup header does not match\n"); + pr_err("wakeup header does not match\n"); return -EINVAL; } diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c index 222a570..391229b 100644 --- a/arch/x86/kernel/apb_timer.c +++ b/arch/x86/kernel/apb_timer.c @@ -196,8 +196,8 @@ void apbt_setup_secondary_clock(void) dw_apb_clockevent_resume(adev->timer); } - printk(KERN_INFO "Registering CPU %d clockevent device %s, cpu %08x\n", - cpu, adev->name, adev->cpu); + pr_info("Registering CPU %d clockevent device %s, cpu %08x\n", + cpu, adev->name, adev->cpu); apbt_setup_irq(adev); dw_apb_clockevent_register(adev->timer); @@ -327,7 +327,7 @@ void __init apbt_time_init(void) #ifdef CONFIG_SMP /* kernel cmdline disable apb timer, so we will use lapic timers */ if (intel_mid_timer_options == INTEL_MID_TIMER_LAPIC_APBT) { - printk(KERN_INFO "apbt: disabled per cpu timer\n"); + pr_info("apbt: disabled per cpu timer\n"); return; } pr_debug("%s: %d CPUs online\n", __func__, num_online_cpus()); @@ -400,13 +400,12 @@ unsigned long apbt_quick_calibrate(void) shift = 5; if (unlikely(loop >> shift == 0)) { - printk(KERN_INFO - "APBT TSC calibration failed, not enough resolution\n"); + pr_info("APBT TSC calibration failed, not enough resolution\n"); return 0; } scale = (int)div_u64((t2 - t1), loop >> shift); khz = (scale * (apbt_freq / 1000)) >> shift; - printk(KERN_INFO "TSC freq calculated by APB timer is %lu khz\n", khz); + pr_info("TSC freq calculated by APB timer is %lu khz\n", khz); return khz; failed: return 0; diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8a5cdda..ae42959 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1306,8 +1306,8 @@ void setup_local_APIC(void) } } if (acked > 256) { - printk(KERN_ERR "LAPIC pending interrupts after %d EOI\n", - acked); + pr_err("LAPIC pending interrupts after %d EOI\n", + acked); break; } if (queued) { @@ -1454,7 +1454,7 @@ static void __x2apic_disable(void) /* Disable xapic and x2apic first and then reenable xapic mode */ wrmsrl(MSR_IA32_APICBASE, msr & ~(X2APIC_ENABLE | XAPIC_ENABLE)); wrmsrl(MSR_IA32_APICBASE, msr & ~X2APIC_ENABLE); - printk_once(KERN_INFO "x2apic disabled\n"); + pr_info_once("x2apic disabled\n"); } static void __x2apic_enable(void) @@ -1465,7 +1465,7 @@ static void __x2apic_enable(void) if (msr & X2APIC_ENABLE) return; wrmsrl(MSR_IA32_APICBASE, msr | X2APIC_ENABLE); - printk_once(KERN_INFO "x2apic enabled\n"); + pr_info_once("x2apic enabled\n"); } static int __init setup_nox2apic(char *str) @@ -1474,8 +1474,8 @@ 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"); diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c index cf9bd89..52f0fb5 100644 --- a/arch/x86/kernel/apic/bigsmp_32.c +++ b/arch/x86/kernel/apic/bigsmp_32.c @@ -67,8 +67,7 @@ static void bigsmp_init_apic_ldr(void) static void bigsmp_setup_apic_routing(void) { - printk(KERN_INFO - "Enabling APIC mode: Physflat. Using %d I/O APICs\n", + pr_info("Enabling APIC mode: Physflat. Using %d I/O APICs\n", nr_ioapics); } @@ -110,7 +109,7 @@ static int dmi_bigsmp; /* can be set by dmi scanners */ static int hp_ht_bigsmp(const struct dmi_system_id *d) { - printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident); + pr_notice("%s detected: force use of apic=bigsmp\n", d->ident); dmi_bigsmp = 1; return 0; diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index fdb0fbf..3f42c31 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1347,7 +1347,7 @@ void __init print_IO_APICs(void) * We are a bit conservative about what we expect. We have to * know about every hardware change ASAP. */ - printk(KERN_INFO "testing the IO APIC.......................\n"); + pr_info("testing the IO APIC.......................\n"); for_each_ioapic(ioapic_idx) print_IO_APIC(ioapic_idx); @@ -1373,7 +1373,7 @@ void __init print_IO_APICs(void) pr_cont("\n"); } - printk(KERN_INFO ".................................... done.\n"); + pr_info(".................................... done.\n"); } /* Where if anywhere is the i8259 connect in external int mode */ @@ -1413,7 +1413,7 @@ void __init enable_IO_APIC(void) i8259_apic = find_isa_irq_apic(0, mp_ExtINT); /* Trust the MP table if nothing is setup in the hardware */ if ((ioapic_i8259.pin == -1) && (i8259_pin >= 0)) { - printk(KERN_WARNING "ExtINT not setup in hardware but reported by MP table\n"); + pr_warn("ExtINT not setup in hardware but reported by MP table\n"); ioapic_i8259.pin = i8259_pin; ioapic_i8259.apic = i8259_apic; } @@ -1421,7 +1421,7 @@ void __init enable_IO_APIC(void) if (((ioapic_i8259.apic != i8259_apic) || (ioapic_i8259.pin != i8259_pin)) && (i8259_pin >= 0) && (ioapic_i8259.pin >= 0)) { - printk(KERN_WARNING "ExtINT in hardware and MP table differ\n"); + pr_warn("ExtINT in hardware and MP table differ\n"); } /* @@ -1508,9 +1508,9 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void) old_id = mpc_ioapic_id(ioapic_idx); if (mpc_ioapic_id(ioapic_idx) >= get_physical_broadcast()) { - printk(KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n", + pr_err("BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n", ioapic_idx, mpc_ioapic_id(ioapic_idx)); - printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n", + pr_err("... fixing up to %d. (tell your hw vendor)\n", reg_00.bits.ID); ioapics[ioapic_idx].mp_config.apicid = reg_00.bits.ID; } @@ -1522,14 +1522,14 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void) */ if (apic->check_apicid_used(&phys_id_present_map, mpc_ioapic_id(ioapic_idx))) { - printk(KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n", + pr_err("BIOS bug, IO-APIC#%d ID %d is already used!...\n", ioapic_idx, mpc_ioapic_id(ioapic_idx)); for (i = 0; i < get_physical_broadcast(); i++) if (!physid_isset(i, phys_id_present_map)) break; if (i >= get_physical_broadcast()) panic("Max APIC ID exceeded!\n"); - printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n", + pr_err("... fixing up to %d. (tell your hw vendor)\n", i); physid_set(i, phys_id_present_map); ioapics[ioapic_idx].mp_config.apicid = i; @@ -2369,8 +2369,8 @@ static int io_apic_get_unique_id(int ioapic, int apic_id) raw_spin_unlock_irqrestore(&ioapic_lock, flags); if (apic_id >= get_physical_broadcast()) { - printk(KERN_WARNING "IOAPIC[%d]: Invalid apic_id %d, trying " - "%d\n", ioapic, apic_id, reg_00.bits.ID); + pr_warn("IOAPIC[%d]: Invalid apic_id %d, trying %d\n", + ioapic, apic_id, reg_00.bits.ID); apic_id = reg_00.bits.ID; } @@ -2388,8 +2388,8 @@ static int io_apic_get_unique_id(int ioapic, int apic_id) if (i == get_physical_broadcast()) panic("Max apic_id exceeded!\n"); - printk(KERN_WARNING "IOAPIC[%d]: apic_id %d already used, " - "trying %d\n", ioapic, apic_id, i); + pr_warn("IOAPIC[%d]: apic_id %d already used, trying %d\n", + ioapic, apic_id, i); apic_id = i; } @@ -2609,10 +2609,7 @@ void __init io_apic_init_mappings(void) ioapic_phys = mpc_ioapic_addr(i); #ifdef CONFIG_X86_32 if (!ioapic_phys) { - printk(KERN_ERR - "WARNING: bogus zero IO-APIC " - "address found in MPTABLE, " - "disabling IO/APIC support!\n"); + pr_err("WARNING: bogus zero IO-APIC address found in MPTABLE, disabling IO/APIC support!\n"); smp_found_config = 0; skip_ioapic_setup = 1; goto fake_ioapic_page; @@ -2644,8 +2641,7 @@ void __init ioapic_insert_resources(void) if (!r) { if (nr_ioapics > 0) - printk(KERN_ERR - "IO APIC resources couldn't be allocated.\n"); + pr_err("IO APIC resources couldn't be allocated.\n"); return; } @@ -2669,7 +2665,7 @@ int mp_find_ioapic(u32 gsi) return i; } - printk(KERN_ERR "ERROR: Unable to locate IOAPIC for GSI %d\n", gsi); + pr_err("ERROR: Unable to locate IOAPIC for GSI %d\n", gsi); return -1; } diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c index f316e34..92c1e2e 100644 --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c @@ -60,8 +60,7 @@ static int default_x86_32_early_logical_apicid(int cpu) static void setup_apic_flat_routing(void) { #ifdef CONFIG_X86_IO_APIC - printk(KERN_INFO - "Enabling APIC mode: Flat. Using %d I/O APICs\n", + pr_info("Enabling APIC mode: Flat. Using %d I/O APICs\n", nr_ioapics); #endif } @@ -202,7 +201,7 @@ void __init generic_apic_probe(void) if (drv == __apicdrivers_end) panic("Didn't find an APIC driver"); } - printk(KERN_INFO "Using APIC driver %s\n", apic->name); + pr_info("Using APIC driver %s\n", apic->name); } /* This function can switch the APIC even after the initial ->probe() */ @@ -218,8 +217,7 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id) if (!cmdline_apic) { apic = *drv; - printk(KERN_INFO "Switched to APIC driver `%s'.\n", - apic->name); + pr_info("Switched to APIC driver `%s'.\n", apic->name); } return 1; } diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 624db005..e7cebce 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -725,9 +725,7 @@ static __init void uv_rtc_init(void) status = uv_bios_freq_base(BIOS_FREQ_BASE_REALTIME_CLOCK, &ticks_per_sec); if (status != BIOS_STATUS_SUCCESS || ticks_per_sec < 100000) { - printk(KERN_WARNING - "unable to determine platform RTC clock frequency, " - "guessing.\n"); + pr_warn("unable to determine platform RTC clock frequency, guessing.\n"); /* BIOS gives wrong value for clock freq. so guess */ sn_rtc_cycles_per_second = 1000000000000UL / 30000UL; } else diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 052c9c3..8363507 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -1760,7 +1760,7 @@ static int apm(void *unused) } if (debug) - printk(KERN_INFO "apm: Connection version %d.%d\n", + pr_info("apm: Connection version %d.%d\n", (apm_info.connection_version >> 8) & 0xff, apm_info.connection_version & 0xff); @@ -1791,7 +1791,7 @@ static int apm(void *unused) if (debug && (num_online_cpus() == 1 || smp)) { error = apm_get_power_status(&bx, &cx, &dx); if (error) - printk(KERN_INFO "apm: power status not available\n"); + pr_info("apm: power status not available\n"); else { switch ((bx >> 8) & 0xff) { case 0: @@ -1824,17 +1824,15 @@ static int apm(void *unused) bat_stat = "unknown"; break; } - printk(KERN_INFO - "apm: AC %s, battery status %s, battery life ", - power_stat, bat_stat); + pr_info("apm: AC %s, battery status %s, battery life ", + power_stat, bat_stat); if ((cx & 0xff) == 0xff) printk("unknown\n"); else printk("%d%%\n", cx & 0xff); if (apm_info.connection_version > 0x100) { - printk(KERN_INFO - "apm: battery flag 0x%02x, battery life ", - (cx >> 8) & 0xff); + pr_info("apm: battery flag 0x%02x, battery life ", + (cx >> 8) & 0xff); if (dx == 0xffff) printk("unknown\n"); else @@ -1943,8 +1941,8 @@ static int __init print_if_true(const struct dmi_system_id *d) */ static int __init broken_ps2_resume(const struct dmi_system_id *d) { - printk(KERN_INFO "%s machine detected. Mousepad Resume Bug " - "workaround hopefully not needed.\n", d->ident); + pr_info("%s machine detected. Mousepad Resume Bug workaround hopefully not needed.\n", + d->ident); return 0; } @@ -1953,8 +1951,8 @@ static int __init set_realmode_power_off(const struct dmi_system_id *d) { if (apm_info.realmode_power_off == 0) { apm_info.realmode_power_off = 1; - printk(KERN_INFO "%s bios detected. " - "Using realmode poweroff only.\n", d->ident); + pr_info("%s bios detected. Using realmode poweroff only.\n", + d->ident); } return 0; } @@ -1964,8 +1962,8 @@ static int __init set_apm_ints(const struct dmi_system_id *d) { if (apm_info.allow_ints == 0) { apm_info.allow_ints = 1; - printk(KERN_INFO "%s machine detected. " - "Enabling interrupts during APM calls.\n", d->ident); + pr_info("%s machine detected. Enabling interrupts during APM calls.\n", + d->ident); } return 0; } @@ -1975,8 +1973,7 @@ static int __init apm_is_horked(const struct dmi_system_id *d) { if (apm_info.disabled == 0) { apm_info.disabled = 1; - printk(KERN_INFO "%s machine detected. " - "Disabling APM.\n", d->ident); + pr_info("%s machine detected. Disabling APM.\n", d->ident); } return 0; } @@ -1985,10 +1982,9 @@ static int __init apm_is_horked_d850md(const struct dmi_system_id *d) { if (apm_info.disabled == 0) { apm_info.disabled = 1; - printk(KERN_INFO "%s machine detected. " - "Disabling APM.\n", d->ident); - printk(KERN_INFO "This bug is fixed in bios P15 which is available for\n"); - printk(KERN_INFO "download from support.intel.com\n"); + pr_info("%s machine detected. Disabling APM.\n", d->ident); + pr_info("This bug is fixed in bios P15 which is available for\n"); + pr_info("download from support.intel.com\n"); } return 0; } @@ -1998,8 +1994,8 @@ static int __init apm_likes_to_melt(const struct dmi_system_id *d) { if (apm_info.forbid_idle == 0) { apm_info.forbid_idle = 1; - printk(KERN_INFO "%s machine detected. " - "Disabling APM idle calls.\n", d->ident); + pr_info("%s machine detected. Disabling APM idle calls.\n", + d->ident); } return 0; } @@ -2268,17 +2264,16 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { - printk(KERN_INFO "apm: BIOS not found.\n"); + pr_info("apm: BIOS not found.\n"); return -ENODEV; } - printk(KERN_INFO - "apm: BIOS version %d.%d Flags 0x%02x (Driver version %s)\n", - ((apm_info.bios.version >> 8) & 0xff), - (apm_info.bios.version & 0xff), - apm_info.bios.flags, - driver_version); + pr_info("apm: BIOS version %d.%d Flags 0x%02x (Driver version %s)\n", + ((apm_info.bios.version >> 8) & 0xff), + (apm_info.bios.version & 0xff), + apm_info.bios.flags, + driver_version); if ((apm_info.bios.flags & APM_32_BIT_SUPPORT) == 0) { - printk(KERN_INFO "apm: no 32 bit BIOS support\n"); + pr_info("apm: no 32 bit BIOS support\n"); return -ENODEV; } @@ -2304,7 +2299,7 @@ static int __init apm_init(void) apm_info.bios.cseg_16_len = 0; /* 64k */ if (debug) { - printk(KERN_INFO "apm: entry %x:%x cseg16 %x dseg %x", + pr_info("apm: entry %x:%x cseg16 %x dseg %x", apm_info.bios.cseg, apm_info.bios.offset, apm_info.bios.cseg_16, apm_info.bios.dseg); if (apm_info.bios.version > 0x100) diff --git a/arch/x86/kernel/bootflag.c b/arch/x86/kernel/bootflag.c index 52c8e3c..8056ed9 100644 --- a/arch/x86/kernel/bootflag.c +++ b/arch/x86/kernel/bootflag.c @@ -41,7 +41,7 @@ static void __init sbf_write(u8 v) if (!parity(v)) v |= SBF_PARITY; - printk(KERN_INFO "Simple Boot Flag at 0x%x set to 0x%x\n", + pr_info("Simple Boot Flag at 0x%x set to 0x%x\n", sbf_port, v); spin_lock_irqsave(&rtc_lock, flags); diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c index 145863d..8ad9da5 100644 --- a/arch/x86/kernel/check.c +++ b/arch/x86/kernel/check.c @@ -112,7 +112,8 @@ void __init setup_bios_corruption_check(void) } if (num_scan_areas) - printk(KERN_INFO "Scanning %d areas for low memory corruption\n", num_scan_areas); + pr_info("Scanning %d areas for low memory corruption\n", + num_scan_areas); } @@ -156,8 +157,8 @@ static int start_periodic_check_for_corruption(void) if (!num_scan_areas || !memory_corruption_check || corruption_check_period == 0) return 0; - printk(KERN_INFO "Scanning for low memory corruption every %d seconds\n", - corruption_check_period); + pr_info("Scanning for low memory corruption every %d seconds\n", + corruption_check_period); /* First time we run the checks right away */ schedule_delayed_work(&bios_check_work, 0); diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 2836de3..ca403a5 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c @@ -165,8 +165,8 @@ static int __init cpuid_init(void) if (__register_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid", &cpuid_fops)) { - printk(KERN_ERR "cpuid: unable to get major %d for cpuid\n", - CPUID_MAJOR); + pr_err("cpuid: unable to get major %d for cpuid\n", + CPUID_MAJOR); err = -EBUSY; goto out; } diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 621b501..f8e9f2e 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -165,10 +165,10 @@ void __init e820_print_map(char *who) int i; for (i = 0; i < e820.nr_map; i++) { - printk(KERN_INFO "%s: [mem %#018Lx-%#018Lx] ", who, - (unsigned long long) e820.map[i].addr, - (unsigned long long) - (e820.map[i].addr + e820.map[i].size - 1)); + pr_info("%s: [mem %#018Lx-%#018Lx] ", who, + (unsigned long long) e820.map[i].addr, + (unsigned long long) + (e820.map[i].addr + e820.map[i].size - 1)); e820_print_type(e820.map[i].type); printk(KERN_CONT "\n"); } @@ -568,7 +568,7 @@ void __init update_e820(void) { if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map)) return; - printk(KERN_INFO "e820: modified physical RAM map:\n"); + pr_info("e820: modified physical RAM map:\n"); e820_print_map("modified"); } static void __init update_e820_saved(void) @@ -644,9 +644,8 @@ __init void e820_setup_gap(void) */ pci_mem_start = gapstart; - printk(KERN_INFO - "e820: [mem %#010lx-%#010lx] available for PCI devices\n", - gapstart, gapstart + gapsize - 1); + pr_info("e820: [mem %#010lx-%#010lx] available for PCI devices\n", + gapstart, gapstart + gapsize - 1); } /** @@ -667,7 +666,7 @@ void __init parse_e820_ext(u64 phys_addr, u32 data_len) __append_e820_map(extmap, entries); sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); early_memunmap(sdata, data_len); - printk(KERN_INFO "e820: extended physical RAM map:\n"); + pr_info("e820: extended physical RAM map:\n"); e820_print_map("extended"); } @@ -734,7 +733,7 @@ u64 __init early_reserve_e820(u64 size, u64 align) addr = __memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); if (addr) { e820_update_range_saved(addr, size, E820_RAM, E820_RESERVED); - printk(KERN_INFO "e820: update e820_saved for early_reserve_e820\n"); + pr_info("e820: update e820_saved for early_reserve_e820\n"); update_e820_saved(); } @@ -788,8 +787,8 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn) if (last_pfn > max_arch_pfn) last_pfn = max_arch_pfn; - printk(KERN_INFO "e820: last_pfn = %#lx max_arch_pfn = %#lx\n", - last_pfn, max_arch_pfn); + pr_info("e820: last_pfn = %#lx max_arch_pfn = %#lx\n", + last_pfn, max_arch_pfn); return last_pfn; } unsigned long __init e820_end_of_ram_pfn(void) @@ -907,7 +906,7 @@ void __init finish_e820_parsing(void) &e820.nr_map) < 0) early_panic("Invalid user supplied memory map"); - printk(KERN_INFO "e820: user-defined physical RAM map:\n"); + pr_info("e820: user-defined physical RAM map:\n"); e820_print_map("user"); } } @@ -1125,7 +1124,7 @@ void __init setup_memory_map(void) who = x86_init.resources.memory_setup(); memcpy(&e820_saved, &e820, sizeof(struct e820map)); - printk(KERN_INFO "e820: BIOS-provided physical RAM map:\n"); + pr_info("e820: BIOS-provided physical RAM map:\n"); e820_print_map(who); } diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index bca14c8..e843f15 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -33,13 +33,10 @@ static void __init fix_hypertransport_config(int num, int slot, int func) */ htcfg = read_pci_config(num, slot, func, 0x68); if (htcfg & (1 << 18)) { - printk(KERN_INFO "Detected use of extended apic ids " - "on hypertransport bus\n"); + pr_info("Detected use of extended apic ids on hypertransport bus\n"); if ((htcfg & (1 << 17)) == 0) { - printk(KERN_INFO "Enabling hypertransport extended " - "apic interrupt broadcast\n"); - printk(KERN_INFO "Note this is a bios bug, " - "please contact your hw vendor\n"); + pr_info("Enabling hypertransport extended apic interrupt broadcast\n"); + pr_info("Note this is a bios bug, please contact your hw vendor\n"); htcfg |= (1 << 17); write_pci_config(num, slot, func, 0x68, htcfg); } @@ -53,9 +50,7 @@ static void __init via_bugs(int num, int slot, int func) #ifdef CONFIG_GART_IOMMU if ((max_pfn > MAX_DMA32_PFN || force_iommu) && !gart_iommu_aperture_allowed) { - printk(KERN_INFO - "Looks like a VIA chipset. Disabling IOMMU." - " Override with iommu=allowed\n"); + pr_info("Looks like a VIA chipset. Disabling IOMMU. Override with iommu=allowed\n"); gart_iommu_aperture_disabled = 1; } #endif @@ -87,11 +82,8 @@ static void __init nvidia_bugs(int num, int slot, int func) if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) { acpi_skip_timer_override = 1; - printk(KERN_INFO "Nvidia board " - "detected. Ignoring ACPI " - "timer override.\n"); - printk(KERN_INFO "If you got timer trouble " - "try acpi_use_timer_override\n"); + pr_info("Nvidia board detected. Ignoring ACPI timer override.\n"); + pr_info("If you got timer trouble try acpi_use_timer_override\n"); } #endif #endif @@ -137,10 +129,9 @@ static void __init ati_bugs(int num, int slot, int func) } if (acpi_skip_timer_override) { - printk(KERN_INFO "SB4X0 revision 0x%x\n", d); - printk(KERN_INFO "Ignoring ACPI timer override.\n"); - printk(KERN_INFO "If you got timer trouble " - "try acpi_use_timer_override\n"); + pr_info("SB4X0 revision 0x%x\n", d); + pr_info("Ignoring ACPI timer override.\n"); + pr_info("If you got timer trouble try acpi_use_timer_override\n"); } } @@ -179,10 +170,9 @@ static void __init ati_bugs_contd(int num, int slot, int func) acpi_skip_timer_override = 1; if (acpi_skip_timer_override) { - printk(KERN_INFO "SB600 revision 0x%x\n", rev); - printk(KERN_INFO "Ignoring ACPI timer override.\n"); - printk(KERN_INFO "If you got timer trouble " - "try acpi_use_timer_override\n"); + pr_info("SB600 revision 0x%x\n", rev); + pr_info("Ignoring ACPI timer override.\n"); + pr_info("If you got timer trouble try acpi_use_timer_override\n"); } } #else @@ -569,8 +559,8 @@ static void __init intel_graphics_stolen(int num, int slot, int func) size = stolen_funcs->size(num, slot, func); start = stolen_funcs->base(num, slot, func, size); if (size && start) { - printk(KERN_INFO "Reserving Intel graphics stolen memory at 0x%x-0x%x\n", - start, start + (u32)size - 1); + pr_info("Reserving Intel graphics stolen memory at 0x%x-0x%x\n", + start, start + (u32)size - 1); /* Mark this space as reserved */ e820_add_region(start, size, E820_RESERVED); sanitize_e820_map(e820.map, diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c index 471fe27..569fb61 100644 --- a/arch/x86/kernel/fpu/init.c +++ b/arch/x86/kernel/fpu/init.c @@ -342,7 +342,8 @@ static void __init fpu__init_system_ctx_switch(void) if (eagerfpu == ENABLE) setup_force_cpu_cap(X86_FEATURE_EAGER_FPU); - printk(KERN_INFO "x86/fpu: Using '%s' FPU context switches.\n", eagerfpu == ENABLE ? "eager" : "lazy"); + pr_info("x86/fpu: Using '%s' FPU context switches.\n", + eagerfpu == ENABLE ? "eager" : "lazy"); } /* diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index d425cda5..4fb56f9 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -222,7 +222,8 @@ static void __init setup_xstate_features(void) "x86/fpu: misordered xstate at %d\n", last_good_offset); last_good_offset = xstate_offsets[i]; - printk(KERN_INFO "x86/fpu: xstate_offset[%d]: %4d, xstate_sizes[%d]: %4d\n", i, ebx, i, eax); + pr_info("x86/fpu: xstate_offset[%d]: %4d, xstate_sizes[%d]: %4d\n", + i, ebx, i, eax); } } diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index be0ebbb..152f3bd 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -139,31 +139,28 @@ EXPORT_SYMBOL_GPL(is_hpet_enabled); static void _hpet_print_config(const char *function, int line) { u32 i, timers, l, h; - printk(KERN_INFO "hpet: %s(%d):\n", function, line); + pr_info("hpet: %s(%d):\n", function, line); l = hpet_readl(HPET_ID); h = hpet_readl(HPET_PERIOD); timers = ((l & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1; - printk(KERN_INFO "hpet: ID: 0x%x, PERIOD: 0x%x\n", l, h); + pr_info("hpet: ID: 0x%x, PERIOD: 0x%x\n", l, h); l = hpet_readl(HPET_CFG); h = hpet_readl(HPET_STATUS); - printk(KERN_INFO "hpet: CFG: 0x%x, STATUS: 0x%x\n", l, h); + pr_info("hpet: CFG: 0x%x, STATUS: 0x%x\n", l, h); l = hpet_readl(HPET_COUNTER); h = hpet_readl(HPET_COUNTER+4); - printk(KERN_INFO "hpet: COUNTER_l: 0x%x, COUNTER_h: 0x%x\n", l, h); + pr_info("hpet: COUNTER_l: 0x%x, COUNTER_h: 0x%x\n", l, h); for (i = 0; i < timers; i++) { l = hpet_readl(HPET_Tn_CFG(i)); h = hpet_readl(HPET_Tn_CFG(i)+4); - printk(KERN_INFO "hpet: T%d: CFG_l: 0x%x, CFG_h: 0x%x\n", - i, l, h); + pr_info("hpet: T%d: CFG_l: 0x%x, CFG_h: 0x%x\n", i, l, h); l = hpet_readl(HPET_Tn_CMP(i)); h = hpet_readl(HPET_Tn_CMP(i)+4); - printk(KERN_INFO "hpet: T%d: CMP_l: 0x%x, CMP_h: 0x%x\n", - i, l, h); + pr_info("hpet: T%d: CMP_l: 0x%x, CMP_h: 0x%x\n", i, l, h); l = hpet_readl(HPET_Tn_ROUTE(i)); h = hpet_readl(HPET_Tn_ROUTE(i)+4); - printk(KERN_INFO "hpet: T%d ROUTE_l: 0x%x, ROUTE_h: 0x%x\n", - i, l, h); + pr_info("hpet: T%d ROUTE_l: 0x%x, ROUTE_h: 0x%x\n", i, l, h); } } @@ -526,8 +523,8 @@ static irqreturn_t hpet_interrupt_handler(int irq, void *data) struct clock_event_device *hevt = &dev->evt; if (!hevt->event_handler) { - printk(KERN_INFO "Spurious HPET timer interrupt on HPET timer %d\n", - dev->num); + pr_info("Spurious HPET timer interrupt on HPET timer %d\n", + dev->num); return IRQ_HANDLED; } @@ -646,7 +643,7 @@ static void hpet_msi_capability_lookup(unsigned int start_timer) break; } - printk(KERN_INFO "HPET: %d timers in total, %d timers will be used for per-cpu timer\n", + pr_info("HPET: %d timers in total, %d timers will be used for per-cpu timer\n", num_timers, num_timers_used); } diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c index be22f5a..192c22e 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c @@ -313,7 +313,7 @@ static int probe_8259A(void) outb(probe_val, PIC_MASTER_IMR); new_val = inb(PIC_MASTER_IMR); if (new_val != probe_val) { - printk(KERN_INFO "Using NULL legacy PIC\n"); + pr_info("Using NULL legacy PIC\n"); legacy_pic = &null_legacy_pic; } diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 0f05dee..c684b200 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -581,8 +581,7 @@ static int reenter_kprobe(struct kprobe *p, struct pt_regs *regs, * Raise a BUG or we'll continue in an endless reentering loop * and eventually a stack overflow. */ - printk(KERN_WARNING "Unrecoverable kprobe detected at %p.\n", - p->addr); + pr_warn("Unrecoverable kprobe detected at %p.\n", p->addr); dump_kprobe(p); BUG(); default: @@ -1092,12 +1091,11 @@ int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) (addr < (u8 *) jprobe_return_end)) { if (stack_addr(regs) != saved_sp) { struct pt_regs *saved_regs = &kcb->jprobe_saved_regs; - printk(KERN_ERR - "current sp %p does not match saved sp %p\n", - stack_addr(regs), saved_sp); - printk(KERN_ERR "Saved registers for jprobe %p\n", jp); + pr_err("current sp %p does not match saved sp %p\n", + stack_addr(regs), saved_sp); + pr_err("Saved registers for jprobe %p\n", jp); show_regs(saved_regs); - printk(KERN_ERR "Current registers\n"); + pr_err("Current registers\n"); show_regs(regs); BUG(); } diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 47190bd..620096e 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -344,8 +344,8 @@ static void kvm_guest_cpu_init(void) #endif wrmsrl(MSR_KVM_ASYNC_PF_EN, pa | KVM_ASYNC_PF_ENABLED); __this_cpu_write(apf_reason.enabled, 1); - printk(KERN_INFO"KVM setup async PF for cpu %d\n", - smp_processor_id()); + pr_info("KVM setup async PF for cpu %d\n", + smp_processor_id()); } if (kvm_para_has_feature(KVM_FEATURE_PV_EOI)) { @@ -370,8 +370,8 @@ static void kvm_pv_disable_apf(void) wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); __this_cpu_write(apf_reason.enabled, 0); - printk(KERN_INFO"Unregister pv shared memory for cpu %d\n", - smp_processor_id()); + pr_info("Unregister pv shared memory for cpu %d\n", + smp_processor_id()); } static void kvm_pv_guest_cpu_reboot(void *unused) @@ -883,7 +883,7 @@ static __init int kvm_spinlock_init_jump(void) return 0; static_key_slow_inc(¶virt_ticketlocks_enabled); - printk(KERN_INFO "KVM setup paravirtual spinlock\n"); + pr_info("KVM setup paravirtual spinlock\n"); return 0; } diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 72cef58..553f9bd 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -114,8 +114,8 @@ static inline void kvm_sched_clock_init(bool stable) pv_time_ops.sched_clock = kvm_sched_clock_read; set_sched_clock_stable(); - printk(KERN_INFO "kvm-clock: using sched offset of %llu cycles\n", - kvm_sched_clock_offset); + pr_info("kvm-clock: using sched offset of %llu cycles\n", + kvm_sched_clock_offset); BUILD_BUG_ON(sizeof(kvm_sched_clock_offset) > sizeof(((struct pvclock_vcpu_time_info *)NULL)->system_time)); @@ -195,8 +195,8 @@ int kvm_register_clock(char *txt) low = (int)slow_virt_to_phys(src) | 1; high = ((u64)slow_virt_to_phys(src) >> 32); ret = native_write_msr_safe(msr_kvm_system_time, low, high); - printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n", - cpu, high, low, txt); + pr_info("kvm-clock: cpu %d, msr %x:%x, %s\n", + cpu, high, low, txt); return ret; } @@ -263,7 +263,7 @@ void __init kvmclock_init(void) } else if (!(kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE))) return; - printk(KERN_INFO "kvm-clock: Using msrs %x and %x", + pr_info("kvm-clock: Using msrs %x and %x", msr_kvm_system_time, msr_kvm_wall_clock); mem = memblock_alloc(size, PAGE_SIZE); diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c index f4c886d..1e49af9 100644 --- a/arch/x86/kernel/mmconf-fam10h_64.c +++ b/arch/x86/kernel/mmconf-fam10h_64.c @@ -205,7 +205,7 @@ void fam10h_check_enable_mmcfg(void) return; } - printk(KERN_INFO "Enable MMCONFIG on AMD Family 10h\n"); + pr_info("Enable MMCONFIG on AMD Family 10h\n"); val &= ~((FAM10H_MMIO_CONF_BASE_MASK<<FAM10H_MMIO_CONF_BASE_SHIFT) | (FAM10H_MMIO_CONF_BUSRANGE_MASK<<FAM10H_MMIO_CONF_BUSRANGE_SHIFT)); val |= fam10h_pci_mmconf_base | (8 << FAM10H_MMIO_CONF_BUSRANGE_SHIFT) | diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index f08ac28..554df0f 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -67,8 +67,7 @@ u64 _paravirt_ident_64(u64 x) void __init default_banner(void) { - printk(KERN_INFO "Booting paravirtualized kernel on %s\n", - pv_info.name); + pr_info("Booting paravirtualized kernel on %s\n", pv_info.name); } /* Undefined instruction for dealing with missing ops pointers. */ diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 833b1d3..f70c79c 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -998,11 +998,10 @@ static void __init calgary_enable_translation(struct pci_dev *dev) val32 = be32_to_cpu(readl(target)); val32 |= PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE; - printk(KERN_INFO "Calgary: enabling translation on %s PHB %#x\n", - (dev->device == PCI_DEVICE_ID_IBM_CALGARY) ? - "Calgary" : "CalIOC2", busnum); - printk(KERN_INFO "Calgary: errant DMAs will now be prevented on this " - "bus.\n"); + pr_info("Calgary: enabling translation on %s PHB %#x\n", + (dev->device == PCI_DEVICE_ID_IBM_CALGARY) ? + "Calgary" : "CalIOC2", busnum); + pr_info("Calgary: errant DMAs will now be prevented on this bus.\n"); writel(cpu_to_be32(val32), target); readl(target); /* flush */ @@ -1030,7 +1029,7 @@ static void __init calgary_disable_translation(struct pci_dev *dev) val32 = be32_to_cpu(readl(target)); val32 &= ~(PHB_TCE_ENABLE | PHB_DAC_DISABLE | PHB_MCSR_ENABLE); - printk(KERN_INFO "Calgary: disabling translation on PHB %#x!\n", busnum); + pr_info("Calgary: disabling translation on PHB %#x!\n", busnum); writel(cpu_to_be32(val32), target); readl(target); /* flush */ @@ -1359,7 +1358,7 @@ static int __init calgary_iommu_init(void) int ret; /* ok, we're trying to use Calgary - let's roll */ - printk(KERN_INFO "PCI-DMA: Using Calgary IOMMU\n"); + pr_info("PCI-DMA: Using Calgary IOMMU\n"); ret = calgary_init(); if (ret) { @@ -1464,9 +1463,9 @@ int __init detect_calgary(void) if (calgary_found) { iommu_detected = 1; calgary_detected = 1; - printk(KERN_INFO "PCI-DMA: Calgary IOMMU detected.\n"); - printk(KERN_INFO "PCI-DMA: Calgary TCE table spec is %d\n", - specified_table_size); + pr_info("PCI-DMA: Calgary IOMMU detected.\n"); + pr_info("PCI-DMA: Calgary TCE table spec is %d\n", + specified_table_size); x86_init.iommu.iommu_init = calgary_iommu_init; } @@ -1524,8 +1523,8 @@ static int __init calgary_parse_options(char *p) bridge = val; if (bridge < MAX_PHB_BUS_NUM) { - printk(KERN_INFO "Calgary: disabling " - "translation for PHB %#x\n", bridge); + pr_info("Calgary: disabling translation for PHB %#x\n", + bridge); bus_info[bridge].translation_disabled = 1; } } diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c index 7c577a1..2cad97b 100644 --- a/arch/x86/kernel/pci-swiotlb.c +++ b/arch/x86/kernel/pci-swiotlb.c @@ -112,8 +112,7 @@ void __init pci_swiotlb_late_init(void) if (!swiotlb) swiotlb_free(); else { - printk(KERN_INFO "PCI-DMA: " - "Using software bounce buffering for IO (SWIOTLB)\n"); + pr_info("PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n"); swiotlb_print_info(); } } diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index cc457ff..f55715f 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -177,8 +177,7 @@ static struct pci_dev *cached_dev; static void hpet_print_force_info(void) { - printk(KERN_INFO "HPET not enabled in BIOS. " - "You might try hpet=force boot option\n"); + pr_info("HPET not enabled in BIOS. You might try hpet=force boot option\n"); } static void old_ich_force_hpet_resume(void) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index aa52c10..fddfa48 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -338,13 +338,12 @@ static void __init relocate_initrd(void) memblock_reserve(relocated_ramdisk, area_size); initrd_start = relocated_ramdisk + PAGE_OFFSET; initrd_end = initrd_start + ramdisk_size; - printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n", - relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1); + pr_info("Allocated new RAMDISK: [mem %#010llx-%#010llx]\n", + relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1); copy_from_early_mem((void *)initrd_start, ramdisk_image, ramdisk_size); - printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to" - " [mem %#010llx-%#010llx]\n", + pr_info("Move RAMDISK from [mem %#010llx-%#010llx] to [mem %#010llx-%#010llx]\n", ramdisk_image, ramdisk_image + ramdisk_size - 1, relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1); } @@ -382,7 +381,7 @@ static void __init reserve_initrd(void) "disabling initrd (%lld needed, %lld available)\n", ramdisk_size, mapped_size>>1); - printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image, + pr_info("RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image, ramdisk_end - 1); if (pfn_range_is_mapped(PFN_DOWN(ramdisk_image), @@ -457,7 +456,7 @@ static void __init e820_reserve_setup_data(void) sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); memcpy(&e820_saved, &e820, sizeof(struct e820map)); - printk(KERN_INFO "extended physical RAM map:\n"); + pr_info("extended physical RAM map:\n"); e820_print_map("reserve setup_data"); } @@ -881,7 +880,7 @@ void __init setup_arch(char **cmdline_p) */ __flush_tlb_all(); #else - printk(KERN_INFO "Command line: %s\n", boot_command_line); + pr_info("Command line: %s\n", boot_command_line); #endif /* @@ -1030,7 +1029,7 @@ void __init setup_arch(char **cmdline_p) e820_update_range(0x70000000ULL, 0x40000ULL, E820_RAM, E820_RESERVED); sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); - printk(KERN_INFO "fixed physical RAM map:\n"); + pr_info("fixed physical RAM map:\n"); e820_print_map("bad_ppro"); } #else diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 24d57f7..92fba23 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -692,8 +692,8 @@ void smp_announce(void) { int num_nodes = num_online_nodes(); - printk(KERN_INFO "x86: Booted up %d node%s, %d CPUs\n", - num_nodes, (num_nodes > 1 ? "s" : ""), num_online_cpus()); + pr_info("x86: Booted up %d node%s, %d CPUs\n", num_nodes, + (num_nodes > 1 ? "s" : ""), num_online_cpus()); } /* reduce the number of lines printed when booting a large cpu count system */ @@ -710,7 +710,7 @@ static void announce_cpu(int cpu, int apicid) node_width = num_digits(num_possible_nodes()) + 1; /* + '#' */ if (cpu == 1) - printk(KERN_INFO "x86: Booting SMP configuration:\n"); + pr_info("x86: Booting SMP configuration:\n"); if (system_state == SYSTEM_BOOTING) { if (node != current_node) { @@ -718,8 +718,8 @@ static void announce_cpu(int cpu, int apicid) pr_cont("\n"); current_node = node; - printk(KERN_INFO ".... node %*s#%d, CPUs: ", - node_width - num_digits(node), " ", node); + pr_info(".... node %*s#%d, CPUs: ", + node_width - num_digits(node), " ", node); } /* Add padding for the BSP */ diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c index b285d4e..c659998 100644 --- a/arch/x86/kernel/sysfb_efi.c +++ b/arch/x86/kernel/sysfb_efi.c @@ -142,10 +142,9 @@ static int __init efifb_set_system(const struct dmi_system_id *id) return 0; } - printk(KERN_INFO "efifb: dmi detected %s - framebuffer at 0x%08x " - "(%dx%d, stride %d)\n", id->ident, - screen_info.lfb_base, screen_info.lfb_width, - screen_info.lfb_height, screen_info.lfb_linelength); + pr_info("efifb: dmi detected %s - framebuffer at 0x%08x (%dx%d, stride %d)\n", + id->ident, screen_info.lfb_base, screen_info.lfb_width, + screen_info.lfb_height, screen_info.lfb_linelength); return 1; } diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c index 3f92ce0..ea4ad45 100644 --- a/arch/x86/kernel/test_nx.c +++ b/arch/x86/kernel/test_nx.c @@ -115,7 +115,7 @@ static int test_NX(void) test_data = 0xC3; - printk(KERN_INFO "Testing NX protection\n"); + pr_info("Testing NX protection\n"); /* Test 1: check if the stack is not executable */ if (test_address(&stackcode)) { diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index b034b1b..0d8b6a7 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c @@ -97,8 +97,8 @@ static void __init set_vsmp_pv_ops(void) address = early_ioremap(cfg, 8); cap = readl(address); ctl = readl(address + 4); - printk(KERN_INFO "vSMP CTL: capabilities:0x%08x control:0x%08x\n", - cap, ctl); + pr_info("vSMP CTL: capabilities:0x%08x control:0x%08x\n", + cap, ctl); /* If possible, let the vSMP foundation route the interrupt optimally */ #ifdef CONFIG_SMP diff --git a/arch/x86/kvm/assigned-dev.c b/arch/x86/kvm/assigned-dev.c index 9dc091a..80f62f6 100644 --- a/arch/x86/kvm/assigned-dev.c +++ b/arch/x86/kvm/assigned-dev.c @@ -356,7 +356,7 @@ static void kvm_free_assigned_device(struct kvm *kvm, pci_reset_function(assigned_dev->dev); if (pci_load_and_free_saved_state(assigned_dev->dev, &assigned_dev->pci_saved_state)) - printk(KERN_INFO "%s: Couldn't reload %s saved state\n", + pr_info("%s: Couldn't reload %s saved state\n", __func__, dev_name(&assigned_dev->dev->dev)); else pci_restore_state(assigned_dev->dev); @@ -725,8 +725,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, match = kzalloc(sizeof(struct kvm_assigned_dev_kernel), GFP_KERNEL); if (match == NULL) { - printk(KERN_INFO "%s: Couldn't allocate memory\n", - __func__); + pr_info("%s: Couldn't allocate memory\n", __func__); r = -ENOMEM; goto out; } @@ -734,7 +733,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, assigned_dev->busnr, assigned_dev->devfn); if (!dev) { - printk(KERN_INFO "%s: host device not found\n", __func__); + pr_info("%s: host device not found\n", __func__); r = -EINVAL; goto out_free; } @@ -750,14 +749,14 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, goto out_put; if (pci_enable_device(dev)) { - printk(KERN_INFO "%s: Could not enable PCI device\n", __func__); + pr_info("%s: Could not enable PCI device\n", __func__); r = -EBUSY; goto out_put; } r = pci_request_regions(dev, "kvm_assigned_device"); if (r) { - printk(KERN_INFO "%s: Could not get access to device regions\n", - __func__); + pr_info("%s: Could not get access to device regions\n", + __func__); goto out_disable; } @@ -800,8 +799,8 @@ out: return r; out_list_del: if (pci_load_and_free_saved_state(dev, &match->pci_saved_state)) - printk(KERN_INFO "%s: Couldn't reload %s saved state\n", - __func__, dev_name(&dev->dev)); + pr_info("%s: Couldn't reload %s saved state\n", __func__, + dev_name(&dev->dev)); list_del(&match->list); pci_release_regions(dev); out_disable: @@ -826,8 +825,8 @@ static int kvm_vm_ioctl_deassign_device(struct kvm *kvm, match = kvm_find_assigned_dev(&kvm->arch.assigned_dev_head, assigned_dev->assigned_dev_id); if (!match) { - printk(KERN_INFO "%s: device hasn't been assigned before, " - "so cannot be deassigned\n", __func__); + pr_info("%s: device hasn't been assigned before, so cannot be deassigned\n", + __func__); r = -EINVAL; goto out; } diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 6525e92..0bfd372 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -140,7 +140,7 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu) } if (entry && (entry->edx & F(NX)) && !is_efer_nx()) { entry->edx &= ~F(NX); - printk(KERN_INFO "kvm: guest NX capability removed\n"); + pr_info("kvm: guest NX capability removed\n"); } } diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 3721736..378f905 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -63,7 +63,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, if (irq->dest_mode == 0 && irq->dest_id == 0xff && kvm_lowest_prio_delivery(irq)) { - printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n"); + pr_info("kvm: apic: phys broadcast and lowest prio\n"); irq->delivery_mode = APIC_DM_FIXED; } diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 1482a58..b14f151 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -770,8 +770,7 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src, */ if (!dst[idx] && !kvm->arch.disabled_lapic_found) { kvm->arch.disabled_lapic_found = true; - printk(KERN_INFO - "Disabled LAPIC found during irq injection\n"); + pr_info("Disabled LAPIC found during irq injection\n"); goto out; } @@ -867,8 +866,7 @@ bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, struct kvm_lapic_irq *irq, dst = map->logical_map[cid][idx]; if (!dst && !kvm->arch.disabled_lapic_found) { kvm->arch.disabled_lapic_found = true; - printk(KERN_INFO - "Disabled LAPIC found during irq injection\n"); + pr_info("Disabled LAPIC found during irq injection\n"); goto out; } diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index c13a64b..fe33b7e 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -621,7 +621,7 @@ static int has_svm(void) const char *msg; if (!cpu_has_svm(&msg)) { - printk(KERN_INFO "has_svm: %s\n", msg); + pr_info("has_svm: %s\n", msg); return 0; } @@ -899,7 +899,7 @@ static __init int svm_hardware_setup(void) } if (nested) { - printk(KERN_INFO "kvm: Nested Virtualization enabled\n"); + pr_info("kvm: Nested Virtualization enabled\n"); kvm_enable_efer_bits(EFER_SVME | EFER_LMSLE); } @@ -913,12 +913,12 @@ static __init int svm_hardware_setup(void) npt_enabled = false; if (npt_enabled && !npt) { - printk(KERN_INFO "kvm: Nested Paging disabled\n"); + pr_info("kvm: Nested Paging disabled\n"); npt_enabled = false; } if (npt_enabled) { - printk(KERN_INFO "kvm: Nested Paging enabled\n"); + pr_info("kvm: Nested Paging enabled\n"); kvm_enable_tdp(); } else kvm_disable_tdp(); diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 164eb9e..1b9fcfe 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -10771,9 +10771,8 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq, */ ret = irq_set_vcpu_affinity(host_irq, NULL); if (ret < 0) { - printk(KERN_INFO - "failed to back to remapped mode, irq: %u\n", - host_irq); + pr_info("failed to back to remapped mode, irq: %u\n", + host_irq); goto out; } @@ -10796,8 +10795,7 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq, } if (ret < 0) { - printk(KERN_INFO "%s: failed to update PI IRTE\n", - __func__); + pr_info("%s: failed to update PI IRTE\n", __func__); goto out; } } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ee3e990..85a4fd8 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8355,8 +8355,8 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, */ ret = kvm_x86_ops->update_pi_irte(irqfd->kvm, prod->irq, irqfd->gsi, 0); if (ret) - printk(KERN_INFO "irq bypass consumer (token %p) unregistration" - " fails: %d\n", irqfd->consumer.token, ret); + pr_info("irq bypass consumer (token %p) unregistration fails: %d\n", + irqfd->consumer.token, ret); } int kvm_arch_update_irqfd_routing(struct kvm *kvm, unsigned int host_irq, diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index fd57d3a..84c7e29 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -1304,7 +1304,7 @@ static void probe_pci_console(void) } console_cfg_offset = device_offset; - printk(KERN_INFO "lguest: Console via virtio-pci emerg_wr\n"); + pr_info("lguest: Console via virtio-pci emerg_wr\n"); } /* diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index a6d7392..84ec14d 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -124,8 +124,8 @@ void __init set_highmem_pages_init(void) zone_end_pfn = zone_start_pfn + zone->spanned_pages; nid = zone_to_nid(zone); - printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n", - zone->name, nid, zone_start_pfn, zone_end_pfn); + pr_info("Initializing %s for node %d (%08lx:%08lx)\n", + zone->name, nid, zone_start_pfn, zone_end_pfn); add_highpages_with_active_regions(nid, zone_start_pfn, zone_end_pfn); diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 9d56f27..9ac3701 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -174,7 +174,7 @@ static void __init probe_page_size_mask(void) /* Enable 1 GB linear kernel mappings if available: */ if (direct_gbpages && cpu_has_gbpages) { - printk(KERN_INFO "Using GB pages for direct mapping\n"); + pr_info("Using GB pages for direct mapping\n"); page_size_mask |= 1 << PG_LEVEL_1G; } else { direct_gbpages = 0; diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index a4bb1c7..a888792 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -680,9 +680,9 @@ void __init initmem_init(void) void __init setup_bootmem_allocator(void) { - printk(KERN_INFO " mapped low ram: 0 - %08lx\n", + pr_info(" mapped low ram: 0 - %08lx\n", max_pfn_mapped<<PAGE_SHIFT); - printk(KERN_INFO " low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT); + pr_info(" low ram: 0 - %08lx\n", max_low_pfn<<PAGE_SHIFT); } /* @@ -717,8 +717,7 @@ void __init paging_init(void) */ static void __init test_wp_bit(void) { - printk(KERN_INFO - "Checking if this processor honours the WP bit even in supervisor mode..."); + pr_info("Checking if this processor honours the WP bit even in supervisor mode..."); /* Any page-aligned address will do, the test is non-destructive */ __set_fixmap(FIX_WP_TEST, __pa(&swapper_pg_dir), PAGE_KERNEL_RO); @@ -757,7 +756,7 @@ void __init mem_init(void) after_bootmem = 1; mem_init_print_info(NULL); - printk(KERN_INFO "virtual kernel memory layout:\n" + pr_info("virtual kernel memory layout:\n" " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" #ifdef CONFIG_HIGHMEM " pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n" @@ -915,7 +914,7 @@ static void mark_nxdata_nx(void) unsigned long size = (((unsigned long)__init_end + HPAGE_SIZE) & HPAGE_MASK) - start; if (__supported_pte_mask & _PAGE_NX) - printk(KERN_INFO "NX-protecting the kernel data: %luk\n", size >> 10); + pr_info("NX-protecting the kernel data: %luk\n", size >> 10); set_pages_nx(virt_to_page(start), size >> PAGE_SHIFT); } @@ -925,32 +924,32 @@ void mark_rodata_ro(void) unsigned long size = PFN_ALIGN(_etext) - start; set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); - printk(KERN_INFO "Write protecting the kernel text: %luk\n", + pr_info("Write protecting the kernel text: %luk\n", size >> 10); kernel_set_to_readonly = 1; #ifdef CONFIG_CPA_DEBUG - printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n", + pr_info("Testing CPA: Reverting %lx-%lx\n", start, start+size); set_pages_rw(virt_to_page(start), size>>PAGE_SHIFT); - printk(KERN_INFO "Testing CPA: write protecting again\n"); + pr_info("Testing CPA: write protecting again\n"); set_pages_ro(virt_to_page(start), size>>PAGE_SHIFT); #endif start += size; size = (unsigned long)__end_rodata - start; set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); - printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", + pr_info("Write protecting the kernel read-only data: %luk\n", size >> 10); rodata_test(); #ifdef CONFIG_CPA_DEBUG - printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, start + size); + pr_info("Testing CPA: undo %lx-%lx\n", start, start + size); set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT); - printk(KERN_INFO "Testing CPA: write protecting again\n"); + pr_info("Testing CPA: write protecting again\n"); set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); #endif mark_nxdata_nx(); diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 9686535..bcc8873 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1126,8 +1126,8 @@ void mark_rodata_ro(void) unsigned long rodata_end = PFN_ALIGN(&__end_rodata); unsigned long all_end; - printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", - (end - start) >> 10); + pr_info("Write protecting the kernel read-only data: %luk\n", + (end - start) >> 10); set_memory_ro(start, (end - start) >> PAGE_SHIFT); kernel_set_to_readonly = 1; @@ -1150,10 +1150,10 @@ void mark_rodata_ro(void) rodata_test(); #ifdef CONFIG_CPA_DEBUG - printk(KERN_INFO "Testing CPA: undo %lx-%lx\n", start, end); + pr_info("Testing CPA: undo %lx-%lx\n", start, end); set_memory_rw(start, (end-start) >> PAGE_SHIFT); - printk(KERN_INFO "Testing CPA: again\n"); + pr_info("Testing CPA: again\n"); set_memory_ro(start, (end-start) >> PAGE_SHIFT); #endif diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c index b4f2e7e..018e1fa 100644 --- a/arch/x86/mm/kmemcheck/kmemcheck.c +++ b/arch/x86/mm/kmemcheck/kmemcheck.c @@ -55,19 +55,18 @@ int __init kmemcheck_init(void) * runs before SMP is set up. */ if (setup_max_cpus > 1) { - printk(KERN_INFO - "kmemcheck: Limiting number of CPUs to 1.\n"); + pr_info("kmemcheck: Limiting number of CPUs to 1.\n"); setup_max_cpus = 1; } #endif if (!kmemcheck_selftest()) { - printk(KERN_INFO "kmemcheck: self-tests failed; disabling\n"); + pr_info("kmemcheck: self-tests failed; disabling\n"); kmemcheck_enabled = 0; return -EINVAL; } - printk(KERN_INFO "kmemcheck: Initialized\n"); + pr_info("kmemcheck: Initialized\n"); return 0; } diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index f70c1ff..a2cd371 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -210,11 +210,11 @@ static void __init alloc_node_data(int nid) nd = __va(nd_pa); /* report and initialize */ - printk(KERN_INFO "NODE_DATA(%d) allocated [mem %#010Lx-%#010Lx]\n", nid, + pr_info("NODE_DATA(%d) allocated [mem %#010Lx-%#010Lx]\n", nid, nd_pa, nd_pa + nd_size - 1); tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT); if (tnid != nid) - printk(KERN_INFO " NODE_DATA(%d) on node %d\n", nid, tnid); + pr_info(" NODE_DATA(%d) on node %d\n", nid, tnid); node_data[nid] = nd; memset(NODE_DATA(nid), 0, sizeof(pg_data_t)); @@ -297,7 +297,7 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi) } if (k < mi->nr_blks) continue; - printk(KERN_INFO "NUMA: Node %d [mem %#010Lx-%#010Lx] + [mem %#010Lx-%#010Lx] -> [mem %#010Lx-%#010Lx]\n", + pr_info("NUMA: Node %d [mem %#010Lx-%#010Lx] + [mem %#010Lx-%#010Lx] -> [mem %#010Lx-%#010Lx]\n", bi->nid, bi->start, bi->end - 1, bj->start, bj->end - 1, start, end - 1); bi->start = start; @@ -691,10 +691,10 @@ static int __init numa_init(int (*init_func)(void)) */ static int __init dummy_numa_init(void) { - printk(KERN_INFO "%s\n", - numa_off ? "NUMA turned off" : "No NUMA configuration found"); - printk(KERN_INFO "Faking a node at [mem %#018Lx-%#018Lx]\n", - 0LLU, PFN_PHYS(max_pfn) - 1); + pr_info("%s\n", numa_off ? + "NUMA turned off" : "No NUMA configuration found"); + pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n", + 0LLU, PFN_PHYS(max_pfn) - 1); node_set(0, numa_nodes_parsed); numa_add_memblk(0, 0, PFN_PHYS(max_pfn)); diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index 47b6436..2fe137c 100644 --- a/arch/x86/mm/numa_32.c +++ b/arch/x86/mm/numa_32.c @@ -48,8 +48,7 @@ void memory_present(int nid, unsigned long start, unsigned long end) { unsigned long pfn; - printk(KERN_INFO "Node: %d, start_pfn: %lx, end_pfn: %lx\n", - nid, start, end); + pr_info("Node: %d, start_pfn: %lx, end_pfn: %lx\n", nid, start, end); printk(KERN_DEBUG " Setting physnode_map array to node %d for pfns:\n", nid); printk(KERN_DEBUG " "); start = round_down(start, PAGES_PER_SECTION); diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index a8f90ce..6465356 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -68,8 +68,8 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, numa_remove_memblk_from(phys_blk, pi); } - printk(KERN_INFO "Faking node %d at [mem %#018Lx-%#018Lx] (%LuMB)\n", - nid, eb->start, eb->end - 1, (eb->end - eb->start) >> 20); + pr_info("Faking node %d at [mem %#018llx-%#018llx] (%lluMB)\n", + nid, eb->start, eb->end - 1, (eb->end - eb->start) >> 20); return 0; } diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index 5f169d5..d70f73f 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c @@ -90,8 +90,7 @@ static int print_split(struct split_state *s) } } if (print) { - printk(KERN_INFO - " 4k %lu large %lu gb %lu x %lu[%lx-%lx] miss %lu\n", + pr_info(" 4k %lu large %lu gb %lu x %lu[%lx-%lx] miss %lu\n", s->spg, s->lpg, s->gpg, s->exec, s->min_exec != ~0UL ? s->min_exec : 0, s->max_exec, missed); @@ -122,7 +121,7 @@ static int pageattr_test(void) unsigned long test_addr; if (print) - printk(KERN_INFO "CPA self-test:\n"); + pr_info("CPA self-test:\n"); bm = vzalloc((max_pfn_mapped + 7) / 8); if (!bm) { @@ -227,7 +226,7 @@ static int pageattr_test(void) return -EINVAL; } else { if (print) - printk(KERN_INFO "ok.\n"); + pr_info("ok.\n"); } return 0; diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 4eb287e..d06ed8f 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -519,8 +519,8 @@ void __init reserve_top_address(unsigned long reserve) #ifdef CONFIG_X86_32 BUG_ON(fixmaps_set > 0); __FIXADDR_TOP = round_down(-reserve, 1 << PMD_SHIFT) - PAGE_SIZE; - printk(KERN_INFO "Reserving virtual address space above 0x%08lx (rounded to 0x%08lx)\n", - -reserve, __FIXADDR_TOP + PAGE_SIZE); + pr_info("Reserving virtual address space above 0x%08lx (rounded to 0x%08lx)\n", + -reserve, __FIXADDR_TOP + PAGE_SIZE); #endif } diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c index 8bea847..4968790 100644 --- a/arch/x86/mm/setup_nx.c +++ b/arch/x86/mm/setup_nx.c @@ -45,11 +45,9 @@ void __init x86_report_nx(void) } else { #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) if (disable_nx) { - printk(KERN_INFO "NX (Execute Disable) protection: " - "disabled by kernel command line option\n"); + pr_info("NX (Execute Disable) protection: disabled by kernel command line option\n"); } else { - printk(KERN_INFO "NX (Execute Disable) protection: " - "active\n"); + pr_info("NX (Execute Disable) protection: active\n"); } #else /* 32bit non-PAE kernel, NX cannot be used */ diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index b5f8218..0840092 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -87,8 +87,8 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) pxm = pa->proximity_domain; apic_id = pa->apic_id; if (!apic->apic_id_valid(apic_id)) { - printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n", - pxm, apic_id); + pr_info("SRAT: PXM %u -> X2APIC 0x%04x ignored\n", + pxm, apic_id); return; } node = setup_node(pxm); @@ -99,14 +99,15 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) } if (apic_id >= MAX_LOCAL_APIC) { - printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node); + pr_info("SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", + pxm, apic_id, node); return; } set_apicid_to_node(apic_id, node); node_set(node, numa_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n", - pxm, apic_id, node); + pr_info("SRAT: PXM %u -> APIC 0x%04x -> Node %u\n", + pxm, apic_id, node); } /* Callback for Proximity Domain -> LAPIC mapping */ @@ -140,15 +141,15 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) apic_id = pa->apic_id; if (apic_id >= MAX_LOCAL_APIC) { - printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node); + pr_info("SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", + pxm, apic_id, node); return; } set_apicid_to_node(apic_id, node); node_set(node, numa_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n", - pxm, apic_id, node); + pr_info("SRAT: PXM %u -> APIC 0x%02x -> Node %u\n", pxm, apic_id, node); } #ifdef CONFIG_MEMORY_HOTPLUG diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 1d2e639..24634ed 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -601,8 +601,8 @@ static int __init p4_init(char **cpu_type) } #endif - printk(KERN_INFO "oprofile: P4 HyperThreading detected with > 2 threads\n"); - printk(KERN_INFO "oprofile: Reverting to timer mode.\n"); + pr_info("oprofile: P4 HyperThreading detected with > 2 threads\n"); + pr_info("oprofile: Reverting to timer mode.\n"); return 0; } @@ -618,10 +618,10 @@ static int set_cpu_type(const char *str, struct kernel_param *kp) { if (!strcmp(str, "timer")) { force_cpu_type = timer; - printk(KERN_INFO "oprofile: forcing NMI timer mode\n"); + pr_info("oprofile: forcing NMI timer mode\n"); } else if (!strcmp(str, "arch_perfmon")) { force_cpu_type = arch_perfmon; - printk(KERN_INFO "oprofile: forcing architectural perfmon\n"); + pr_info("oprofile: forcing architectural perfmon\n"); } else { force_cpu_type = 0; } @@ -792,7 +792,7 @@ int __init op_nmi_init(struct oprofile_operations *ops) init_suspend_resume(); - printk(KERN_INFO "oprofile: using NMI interrupt.\n"); + pr_info("oprofile: using NMI interrupt.\n"); return 0; } diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index 660a83c..b661690 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c @@ -450,7 +450,7 @@ static void init_ibs(void) if (!ibs_caps) return; - printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps); + pr_info("oprofile: AMD IBS detected (0x%08x)\n", ibs_caps); } static int (*create_arch_files)(struct dentry *root); diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 3cd6983..a9e6b75 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -35,7 +35,7 @@ static int __init set_nouse_crs(const struct dmi_system_id *id) static int __init set_ignore_seg(const struct dmi_system_id *id) { - printk(KERN_INFO "PCI: %s detected: ignoring ACPI _SEG\n", id->ident); + pr_info("PCI: %s detected: ignoring ACPI _SEG\n", id->ident); pci_ignore_seg = true; return 0; } @@ -147,10 +147,9 @@ void __init pci_acpi_crs_quirks(void) else if (pci_probe & PCI_USE__CRS) pci_use_crs = true; - printk(KERN_INFO "PCI: %s host bridge windows from ACPI; " - "if necessary, use \"pci=%s\" and report a bug\n", - pci_use_crs ? "Using" : "Ignoring", - pci_use_crs ? "nocrs" : "use_crs"); + pr_info("PCI: %s host bridge windows from ACPI; if necessary, use \"pci=%s\" and report a bug\n", + pci_use_crs ? "Using" : "Ignoring", + pci_use_crs ? "nocrs" : "use_crs"); } #ifdef CONFIG_PCI_MMCONFIG @@ -395,7 +394,7 @@ int __init pci_acpi_init(void) if (acpi_noirq) return -ENODEV; - printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n"); + pr_info("PCI: Using ACPI for IRQ routing\n"); acpi_irq_penalty_init(); pcibios_enable_irq = acpi_pci_irq_enable; pcibios_disable_irq = acpi_pci_irq_disable; @@ -407,7 +406,7 @@ int __init pci_acpi_init(void) * also do it here in case there are still broken drivers that * don't use pci_enable_device(). */ - printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n"); + pr_info("PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n"); for_each_pci_dev(dev) acpi_pci_irq_enable(dev); } diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index c20d2cc..bbdae89 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -194,7 +194,7 @@ static int __init early_root_info_init(void) address = MSR_K8_TOP_MEM1; rdmsrl(address, val); end = (val & 0xffffff800000ULL); - printk(KERN_INFO "TOM: %016llx aka %lldM\n", end, end>>20); + pr_info("TOM: %016llx aka %lldM\n", end, end>>20); if (end < (1ULL<<32)) subtract_range(range, RANGE_NUM, 0, end); @@ -290,7 +290,7 @@ static int __init early_root_info_init(void) address = MSR_K8_TOP_MEM2; rdmsrl(address, val); end = (val & 0xffffff800000ULL); - printk(KERN_INFO "TOM2: %016llx aka %lldM\n", end, end>>20); + pr_info("TOM2: %016llx aka %lldM\n", end, end>>20); subtract_range(range, RANGE_NUM, 1ULL<<32, end); } diff --git a/arch/x86/pci/broadcom_bus.c b/arch/x86/pci/broadcom_bus.c index bb461cf..b5c97fe 100644 --- a/arch/x86/pci/broadcom_bus.c +++ b/arch/x86/pci/broadcom_bus.c @@ -80,10 +80,10 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) res.start = fbus; res.end = lbus; res.flags = IORESOURCE_BUS; - printk(KERN_INFO "CNB20LE PCI Host Bridge (domain 0000 %pR)\n", &res); + pr_info("CNB20LE PCI Host Bridge (domain 0000 %pR)\n", &res); list_for_each_entry(root_res, &info->resources, list) - printk(KERN_INFO "host bridge window %pR\n", &root_res->res); + pr_info("host bridge window %pR\n", &root_res->res); } static int __init broadcom_postcore_init(void) diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 381a43c..340c824 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -83,7 +83,7 @@ DEFINE_RAW_SPINLOCK(pci_config_lock); static int __init can_skip_ioresource_align(const struct dmi_system_id *d) { pci_probe |= PCI_CAN_SKIP_ISA_ALIGN; - printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident); + pr_info("PCI: %s detected, can skip ISA alignment\n", d->ident); return 0; } @@ -189,7 +189,7 @@ static int __init set_bf_sort(const struct dmi_system_id *d) { if (pci_bf_sort == pci_bf_sort_default) { pci_bf_sort = pci_dmi_bf; - printk(KERN_INFO "PCI: %s detected, enabling pci=bfsort.\n", d->ident); + pr_info("PCI: %s detected, enabling pci=bfsort.\n", d->ident); } return 0; } @@ -203,7 +203,7 @@ static void __init read_dmi_type_b1(const struct dmi_header *dm, return; switch (((*(u32 *)d) >> 9) & 0x03) { case 0x00: - printk(KERN_INFO "dmi type 0xB1 record - unknown flag\n"); + pr_info("dmi type 0xB1 record - unknown flag\n"); break; case 0x01: /* set pci=bfsort */ smbios_type_b1_flag = 1; @@ -234,16 +234,16 @@ static int __init find_sort_method(const struct dmi_system_id *d) static int __init assign_all_busses(const struct dmi_system_id *d) { pci_probe |= PCI_ASSIGN_ALL_BUSSES; - printk(KERN_INFO "%s detected: enabling PCI bus# renumbering" - " (pci=assign-busses)\n", d->ident); + pr_info("%s detected: enabling PCI bus# renumbering (pci=assign-busses)\n", + d->ident); return 0; } #endif static int __init set_scan_all(const struct dmi_system_id *d) { - printk(KERN_INFO "PCI: %s detected, enabling pci=pcie_scan_all\n", - d->ident); + pr_info("PCI: %s detected, enabling pci=pcie_scan_all\n", + d->ident); pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS); return 0; } diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c index 1546059..dd7acdc 100644 --- a/arch/x86/pci/direct.c +++ b/arch/x86/pci/direct.c @@ -264,16 +264,14 @@ void __init pci_direct_init(int type) { if (type == 0) return; - printk(KERN_INFO "PCI: Using configuration type %d for base access\n", - type); + pr_info("PCI: Using configuration type %d for base access\n", type); if (type == 1) { raw_pci_ops = &pci_direct_conf1; if (raw_pci_ext_ops) return; if (!(pci_probe & PCI_HAS_IO_ECS)) return; - printk(KERN_INFO "PCI: Using configuration type 1 " - "for extended access\n"); + pr_info("PCI: Using configuration type 1 for extended access\n"); raw_pci_ext_ops = &pci_direct_conf1; return; } diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c index d1067d5..ec75ebc 100644 --- a/arch/x86/pci/early.c +++ b/arch/x86/pci/early.c @@ -62,8 +62,7 @@ void early_dump_pci_device(u8 bus, u8 slot, u8 func) int j; u32 val; - printk(KERN_INFO "pci 0000:%02x:%02x.%d config space:", - bus, slot, func); + pr_info("pci 0000:%02x:%02x.%d config space:", bus, slot, func); for (i = 0; i < 256; i += 4) { if (!(i & 0x0f)) diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 9bd1154..372f149 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -823,7 +823,7 @@ static void __init pirq_find_router(struct irq_router *r) #ifdef CONFIG_PCI_BIOS if (!rt->signature) { - printk(KERN_INFO "PCI: Using BIOS for IRQ routing\n"); + pr_info("PCI: Using BIOS for IRQ routing\n"); r->set = pirq_bios_set; r->name = "BIOS"; return; @@ -1072,7 +1072,7 @@ static int __init fix_broken_hp_bios_irq9(const struct dmi_system_id *d) { if (!broken_hp_bios_irq9) { broken_hp_bios_irq9 = 1; - printk(KERN_INFO "%s detected - fixing broken IRQ routing\n", + pr_info("%s detected - fixing broken IRQ routing\n", d->ident); } return 0; @@ -1086,7 +1086,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d) { if (!acer_tm360_irqrouting) { acer_tm360_irqrouting = 1; - printk(KERN_INFO "%s detected - fixing broken IRQ routing\n", + pr_info("%s detected - fixing broken IRQ routing\n", d->ident); } return 0; @@ -1156,7 +1156,7 @@ void __init pcibios_irq_init(void) * also do it here in case there are still broken drivers that * don't use pci_enable_device(). */ - printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n"); + pr_info("PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n"); for_each_pci_dev(dev) pirq_enable_irq(dev); } diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index ea6f380..aceea71 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -46,7 +46,7 @@ void pcibios_scan_specific_bus(int busn) if (!raw_pci_read(0, busn, devfn, PCI_VENDOR_ID, 2, &l) && l != 0x0000 && l != 0xffff) { DBG("Found device at %02x:%02x [%04x]\n", busn, devfn, l); - printk(KERN_INFO "PCI: Discovered peer bus %02x\n", busn); + pr_info("PCI: Discovered peer bus %02x\n", busn); pcibios_scan_root(busn); return; } diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c index 43984bc..af4957d 100644 --- a/arch/x86/pci/mmconfig_32.c +++ b/arch/x86/pci/mmconfig_32.c @@ -132,7 +132,7 @@ const struct pci_raw_ops pci_mmcfg = { int __init pci_mmcfg_arch_init(void) { - printk(KERN_INFO "PCI: Using MMCONFIG for extended config space\n"); + pr_info("PCI: Using MMCONFIG for extended config space\n"); raw_pci_ext_ops = &pci_mmcfg; return 1; } diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c index 7043a4f..3a3f865 100644 --- a/arch/x86/pci/olpc.c +++ b/arch/x86/pci/olpc.c @@ -308,7 +308,7 @@ static const struct pci_raw_ops pci_olpc_conf = { int __init pci_olpc_init(void) { - printk(KERN_INFO "PCI: Using configuration type OLPC XO-1\n"); + pr_info("PCI: Using configuration type OLPC XO-1\n"); raw_pci_ops = &pci_olpc_conf; is_lx = is_geode_lx(); return 0; diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c index 9770e55..5ff6463 100644 --- a/arch/x86/pci/pcbios.c +++ b/arch/x86/pci/pcbios.c @@ -44,7 +44,7 @@ static inline void set_bios_x(void) pcibios_enabled = 1; set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT); if (__supported_pte_mask & _PAGE_NX) - printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n"); + pr_info("PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n"); } /* @@ -161,7 +161,7 @@ static int __init check_pcibios(void) status, signature); return 0; } - printk(KERN_INFO "PCI: PCI BIOS revision %x.%02x entry at 0x%lx, last bus=%d\n", + pr_info("PCI: PCI BIOS revision %x.%02x entry at 0x%lx, last bus=%d\n", major_ver, minor_ver, pcibios_entry, pcibios_last_bus); #ifdef CONFIG_PCI_DIRECT if (!(hw_mech & PCIBIOS_HW_TYPE1)) @@ -388,7 +388,7 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void) rt->size = opt.size + sizeof(struct irq_routing_table); rt->exclusive_irqs = map; memcpy(rt->slots, (void *) page, opt.size); - printk(KERN_INFO "PCI: Using BIOS Interrupt Routing Table\n"); + pr_info("PCI: Using BIOS Interrupt Routing Table\n"); } } free_page(page); diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index ff31ab4..7a9666c 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -135,7 +135,7 @@ static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polar rc = HYPERVISOR_physdev_op(PHYSDEVOP_setup_gsi, &setup_gsi); if (rc == -EEXIST) - printk(KERN_INFO "Already setup the GSI :%d\n", gsi); + pr_info("Already setup the GSI :%d\n", gsi); else if (rc) { printk(KERN_ERR "Failed to setup GSI :%d, err_code:%d\n", gsi, rc); @@ -408,7 +408,7 @@ int __init pci_xen_init(void) if (!xen_pv_domain() || xen_initial_domain()) return -ENODEV; - printk(KERN_INFO "PCI: setting up Xen PCI frontend stub\n"); + pr_info("PCI: setting up Xen PCI frontend stub\n"); pcibios_set_cache_line_size(); diff --git a/arch/x86/platform/geode/alix.c b/arch/x86/platform/geode/alix.c index 1865c19..841beab 100644 --- a/arch/x86/platform/geode/alix.c +++ b/arch/x86/platform/geode/alix.c @@ -154,9 +154,8 @@ static bool __init alix_present(unsigned long bios_phys, tail = p + alix_sig_len; if ((tail[0] == '2' || tail[0] == '3' || tail[0] == '6')) { - printk(KERN_INFO - "%s: system is recognized as \"%s\"\n", - KBUILD_MODNAME, name); + pr_info("%s: system is recognized as \"%s\"\n", + KBUILD_MODNAME, name); return true; } } @@ -176,8 +175,8 @@ static bool __init alix_present_dmi(void) if (!product || (strcmp(product, "ALIX.2D") && strcmp(product, "ALIX.6"))) return false; - printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", - KBUILD_MODNAME, vendor, product); + pr_info("%s: system is recognized as \"%s %s\"\n", + KBUILD_MODNAME, vendor, product); return true; } diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c index 4fcdb91..b0900da 100644 --- a/arch/x86/platform/geode/geos.c +++ b/arch/x86/platform/geode/geos.c @@ -112,8 +112,8 @@ static int __init geos_init(void) if (!product || strcmp(product, "Geos")) return 0; - printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n", - KBUILD_MODNAME, vendor, product); + pr_info("%s: system is recognized as \"%s %s\"\n", + KBUILD_MODNAME, vendor, product); register_geos(); diff --git a/arch/x86/platform/geode/net5501.c b/arch/x86/platform/geode/net5501.c index a2f6b98..d8a3f5f 100644 --- a/arch/x86/platform/geode/net5501.c +++ b/arch/x86/platform/geode/net5501.c @@ -120,8 +120,8 @@ static bool __init net5501_present(void) unsigned char *model = rombase + boards[i].offset; if (!memcmp(model, boards[i].sig, boards[i].len)) { - printk(KERN_INFO "%s: system is recognized as \"%s\"\n", - KBUILD_MODNAME, model); + pr_info("%s: system is recognized as \"%s\"\n", + KBUILD_MODNAME, model); found = true; break; diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index 735ba21..a37d837 100644 --- a/arch/x86/platform/iris/iris.c +++ b/arch/x86/platform/iris/iris.c @@ -72,14 +72,14 @@ static int iris_probe(struct platform_device *pdev) } old_pm_power_off = pm_power_off; pm_power_off = &iris_power_off; - printk(KERN_INFO "Iris power_off handler installed.\n"); + pr_info("Iris power_off handler installed.\n"); return 0; } static int iris_remove(struct platform_device *pdev) { pm_power_off = old_pm_power_off; - printk(KERN_INFO "Iris power_off handler uninstalled.\n"); + pr_info("Iris power_off handler uninstalled.\n"); return 0; } diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c index c5350fd..dd884bd 100644 --- a/arch/x86/platform/olpc/olpc-xo1-pm.c +++ b/arch/x86/platform/olpc/olpc-xo1-pm.c @@ -94,7 +94,7 @@ asmlinkage __visible int xo1_do_sleep(u8 sleep_state) static void xo1_power_off(void) { - printk(KERN_INFO "OLPC XO-1 power off sequence...\n"); + pr_info("OLPC XO-1 power off sequence...\n"); /* Enable all of these controls with 0 delay */ outl(0x40000000, pms_base + CS5536_PM_SCLK); @@ -148,7 +148,7 @@ static int xo1_pm_probe(struct platform_device *pdev) if (pms_base && acpi_base) { suspend_set_ops(&xo1_suspend_ops); pm_power_off = xo1_power_off; - printk(KERN_INFO "OLPC XO-1 support registered\n"); + pr_info("OLPC XO-1 support registered\n"); } return 0; diff --git a/arch/x86/platform/olpc/olpc_ofw.c b/arch/x86/platform/olpc/olpc_ofw.c index e7604f6..a3655fc 100644 --- a/arch/x86/platform/olpc/olpc_ofw.c +++ b/arch/x86/platform/olpc/olpc_ofw.c @@ -106,7 +106,7 @@ void __init olpc_ofw_detect(void) /* determine where OFW starts in memory */ start = round_down((unsigned long)olpc_ofw_cif, OFW_BOUND); - printk(KERN_INFO "OFW detected in memory, cif @ 0x%lx (reserving top %ldMB)\n", + pr_info("OFW detected in memory, cif @ 0x%lx (reserving top %ldMB)\n", (unsigned long)olpc_ofw_cif, (-start) >> 20); reserve_top_address(-start); } diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index 1584cbe..0a00a49 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -207,7 +207,7 @@ void uv_bios_init(void) memcpy(&uv_systab, tab, sizeof(struct uv_systab)); iounmap(tab); - printk(KERN_INFO "EFI UV System Table Revision %d\n", + pr_info("EFI UV System Table Revision %d\n", uv_systab.revision); } #else /* !CONFIG_EFI */ diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 3b6ec42..74090ac 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -1539,7 +1539,7 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr, break; } if (cnt != e) { - printk(KERN_INFO "bau tunable error: should be %d values\n", e); + pr_info("bau tunable error: should be %d values\n", e); return -EINVAL; } diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c index 2b158a9..4d2c37e 100644 --- a/arch/x86/platform/uv/uv_time.c +++ b/arch/x86/platform/uv/uv_time.c @@ -370,9 +370,9 @@ static __init int uv_rtc_setup_clock(void) rc = clocksource_register_hz(&clocksource_uv, sn_rtc_cycles_per_second); if (rc) - printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc); + pr_info("UV RTC clocksource failed rc %d\n", rc); else - printk(KERN_INFO "UV RTC clocksource registered freq %lu MHz\n", + pr_info("UV RTC clocksource registered freq %lu MHz\n", sn_rtc_cycles_per_second/(unsigned long)1E6); if (rc || !uv_rtc_evt_enable || x86_platform_ipi_callback) @@ -401,13 +401,13 @@ static __init int uv_rtc_setup_clock(void) goto error; } - printk(KERN_INFO "UV RTC clockevents registered\n"); + pr_info("UV RTC clockevents registered\n"); return 0; error: clocksource_unregister(&clocksource_uv); - printk(KERN_INFO "UV RTC clockevents failed rc %d\n", rc); + pr_info("UV RTC clockevents failed rc %d\n", rc); return rc; } diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c index 38b4e4a..29869d8 100644 --- a/arch/x86/um/sysrq_64.c +++ b/arch/x86/um/sysrq_64.c @@ -16,20 +16,20 @@ void show_regs(struct pt_regs *regs) { printk("\n"); print_modules(); - printk(KERN_INFO "Pid: %d, comm: %.20s %s %s\n", task_pid_nr(current), + pr_info("Pid: %d, comm: %.20s %s %s\n", task_pid_nr(current), current->comm, print_tainted(), init_utsname()->release); - printk(KERN_INFO "RIP: %04lx:[<%016lx>]\n", PT_REGS_CS(regs) & 0xffff, - PT_REGS_IP(regs)); - printk(KERN_INFO "RSP: %016lx EFLAGS: %08lx\n", PT_REGS_SP(regs), - PT_REGS_EFLAGS(regs)); - printk(KERN_INFO "RAX: %016lx RBX: %016lx RCX: %016lx\n", - PT_REGS_AX(regs), PT_REGS_BX(regs), PT_REGS_CX(regs)); - printk(KERN_INFO "RDX: %016lx RSI: %016lx RDI: %016lx\n", - PT_REGS_DX(regs), PT_REGS_SI(regs), PT_REGS_DI(regs)); - printk(KERN_INFO "RBP: %016lx R08: %016lx R09: %016lx\n", - PT_REGS_BP(regs), PT_REGS_R8(regs), PT_REGS_R9(regs)); - printk(KERN_INFO "R10: %016lx R11: %016lx R12: %016lx\n", - PT_REGS_R10(regs), PT_REGS_R11(regs), PT_REGS_R12(regs)); - printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n", - PT_REGS_R13(regs), PT_REGS_R14(regs), PT_REGS_R15(regs)); + pr_info("RIP: %04lx:[<%016lx>]\n", PT_REGS_CS(regs) & 0xffff, + PT_REGS_IP(regs)); + pr_info("RSP: %016lx EFLAGS: %08lx\n", PT_REGS_SP(regs), + PT_REGS_EFLAGS(regs)); + pr_info("RAX: %016lx RBX: %016lx RCX: %016lx\n", + PT_REGS_AX(regs), PT_REGS_BX(regs), PT_REGS_CX(regs)); + pr_info("RDX: %016lx RSI: %016lx RDI: %016lx\n", + PT_REGS_DX(regs), PT_REGS_SI(regs), PT_REGS_DI(regs)); + pr_info("RBP: %016lx R08: %016lx R09: %016lx\n", + PT_REGS_BP(regs), PT_REGS_R8(regs), PT_REGS_R9(regs)); + pr_info("R10: %016lx R11: %016lx R12: %016lx\n", + PT_REGS_R10(regs), PT_REGS_R11(regs), PT_REGS_R12(regs)); + pr_info("R13: %016lx R14: %016lx R15: %016lx\n", + PT_REGS_R13(regs), PT_REGS_R14(regs), PT_REGS_R15(regs)); } diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index 48e3858..e8092dd 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c @@ -376,8 +376,8 @@ static int __init __setup_host_supports_tls(void) { check_host_supports_tls(&host_supports_tls, &host_gdt_entry_tls_min); if (host_supports_tls) { - printk(KERN_INFO "Host TLS support detected\n"); - printk(KERN_INFO "Detected host type: "); + pr_info("Host TLS support detected\n"); + pr_info("Detected host type: "); switch (host_gdt_entry_tls_min) { case GDT_ENTRY_TLS_MIN_I386: printk(KERN_CONT "i386"); diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 2c26108..a36683a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -273,9 +273,10 @@ static void __init xen_banner(void) pr_info("Booting paravirtualized kernel %son %s\n", xen_feature(XENFEAT_auto_translated_physmap) ? "with PVH extensions " : "", pv_info.name); - printk(KERN_INFO "Xen version: %d.%d%s%s\n", - version >> 16, version & 0xffff, extra.extraversion, - xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); + pr_info("Xen version: %d.%d%s%s\n", + version >> 16, version & 0xffff, extra.extraversion, + xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? + " (preserve-AD)" : ""); } /* Check if running on Xen version (major, minor) or later */ bool @@ -1769,7 +1770,7 @@ static void __init init_hvm_pv_info(void) major = eax >> 16; minor = eax & 0xffff; - printk(KERN_INFO "Xen version %d.%d.\n", major, minor); + pr_info("Xen version %d.%d.\n", major, minor); cpuid(base + 2, &pages, &msr, &ecx, &edx); diff --git a/arch/x86/xen/platform-pci-unplug.c b/arch/x86/xen/platform-pci-unplug.c index 9586ff3..d948eaf 100644 --- a/arch/x86/xen/platform-pci-unplug.c +++ b/arch/x86/xen/platform-pci-unplug.c @@ -163,16 +163,14 @@ void xen_unplug_emulated_devices(void) * been compiled for this kernel (modules or built-in are both OK). */ if (!xen_emul_unplug) { if (xen_must_unplug_nics()) { - printk(KERN_INFO "Netfront and the Xen platform PCI driver have " - "been compiled for this kernel: unplug emulated NICs.\n"); + pr_info("Netfront and the Xen platform PCI driver have been compiled for this kernel: unplug emulated NICs.\n"); xen_emul_unplug |= XEN_UNPLUG_ALL_NICS; } if (xen_must_unplug_disks()) { - printk(KERN_INFO "Blkfront and the Xen platform PCI driver have " - "been compiled for this kernel: unplug emulated disks.\n" - "You might have to change the root device\n" - "from /dev/hd[a-d] to /dev/xvd[a-d]\n" - "in your root= kernel command line option\n"); + pr_info("Blkfront and the Xen platform PCI driver have been compiled for this kernel: unplug emulated disks.\n" + "You might have to change the root device\n" + "from /dev/hd[a-d] to /dev/xvd[a-d]\n" + "in your root= kernel command line option\n"); xen_emul_unplug |= XEN_UNPLUG_ALL_IDE_DISKS; } } diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 7ab2951..82f0733 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -1050,7 +1050,7 @@ void __init xen_arch_setup(void) #ifdef CONFIG_ACPI if (!(xen_start_info->flags & SIF_INITDOMAIN)) { - printk(KERN_INFO "ACPI in unprivileged domain disabled\n"); + pr_info("ACPI in unprivileged domain disabled\n"); disable_acpi(); } #endif diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index a0a4e55..1333f76 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -362,7 +362,7 @@ void xen_setup_timer(int cpu) if (evt->irq >= 0) xen_teardown_timer(cpu); - printk(KERN_INFO "installing Xen timer for CPU %d\n", cpu); + pr_info("installing Xen timer for CPU %d\n", cpu); snprintf(xevt->name, sizeof(xevt->name), "timer%d", cpu); @@ -471,8 +471,7 @@ void __init xen_hvm_init_time_ops(void) if (!xen_have_vector_callback) return; if (!xen_feature(XENFEAT_hvm_safe_pvclock)) { - printk(KERN_INFO "Xen doesn't support pvclock on HVM," - "disable pv timer\n"); + pr_info("Xen doesn't support pvclock on HVM, disable pv timer\n"); return; } -- 1.8.3.1
| |