Commit 8d3bcc44 authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

x86: Use pr_warn instead of pr_warning 

As said in commit f2c2cbcc ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.

Link: http://lkml.kernel.org/r/20191018031850.48498-7-wangkefeng.wang@huawei.com


To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Robert Richter <rric@kernel.org>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andy@infradead.org>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent eb1414ec

arch/x86/kernel/amd_gart_64.c

+5 −7
Original line number Diff line number Diff line
@@ -510,8 +510,7 @@ 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."

		pr_warn("PCI-DMA: Warning: Small IOMMU %luMB."

			" Consider increasing the AGP aperture in BIOS\n",

			iommu_size >> 20);

	}
@@ -665,8 +664,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;

}
@@ -730,8 +728,8 @@ 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.\n");

			pr_warn("falling back to iommu=soft.\n");

		}

		return 0;

	}

arch/x86/kernel/apic/apic.c

+19 −22
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc) 


	res = (((u64)deltapm) *  mult) >> 22;

	do_div(res, 1000000);

	pr_warning("APIC calibration not consistent "

	pr_warn("APIC calibration not consistent "

		"with PM-Timer: %ldms instead of 100ms\n", (long)res);



	/* Correct the lapic counter value */
@@ -936,7 +936,7 @@ static int __init calibrate_APIC_clock(void) 
	 */

	if (lapic_timer_period < (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;

	}
@@ -979,7 +979,7 @@ 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");

		pr_warn("APIC timer disabled due to verification failure\n");

		return -1;

	}
@@ -1053,7 +1053,7 @@ static void local_apic_timer_interrupt(void) 
	 * spurious.

	 */

	if (!evt->event_handler) {

		pr_warning("Spurious LAPIC timer interrupt on cpu %d\n",

		pr_warn("Spurious LAPIC timer interrupt on cpu %d\n",

			smp_processor_id());

		/* Switch it off */

		lapic_timer_shutdown(evt);
@@ -1725,11 +1725,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",

			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);
@@ -1897,7 +1897,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);
@@ -2324,9 +2324,8 @@ int generic_processor_info(int apicid, int version) 
	    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;
@@ -2340,8 +2339,7 @@ int generic_processor_info(int apicid, int version) 
	    apicid != boot_cpu_physical_apicid) {

		int thiscpu = max + disabled_cpus - 1;



		pr_warning(

			"APIC: NR_CPUS/possible_cpus limit of %i almost"

		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);
@@ -2352,9 +2350,8 @@ int generic_processor_info(int apicid, int version) 
	if (num_processors >= nr_cpu_ids) {

		int thiscpu = max + disabled_cpus;



		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++;

		return -EINVAL;
@@ -2384,13 +2381,13 @@ int generic_processor_info(int apicid, int version) 
	 * Validate version

	 */

	if (version == 0x0) {

		pr_warning("BIOS bug: APIC version is 0 for CPU %d/0x%x, fixing up to 0x10\n",

		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);

	}
@@ -2759,7 +2756,7 @@ static int __init apic_set_verbosity(char *arg) 
		apic_verbosity = APIC_VERBOSE;

#ifdef CONFIG_X86_64

	else {

		pr_warning("APIC Verbosity level %s not recognised"

		pr_warn("APIC Verbosity level %s not recognised"

			" use apic=verbose or apic=debug\n", arg);

		return -EINVAL;

	}

arch/x86/kernel/setup_percpu.c

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 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",

			pr_warn("%s allocator failed (%d), falling back to page size\n",

				pcpu_fc_names[pcpu_chosen_fc], rc);

	}

	if (rc < 0)

arch/x86/kernel/tboot.c

+7 −8
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void __init tboot_probe(void) 
	 */

	if (!e820__mapped_any(boot_params.tboot_addr,

			     boot_params.tboot_addr, E820_TYPE_RESERVED)) {

		pr_warning("non-0 tboot_addr but it is not of type E820_TYPE_RESERVED\n");

		pr_warn("non-0 tboot_addr but it is not of type E820_TYPE_RESERVED\n");

		return;

	}
@@ -65,13 +65,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;

	}
@@ -289,7 +288,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;

	}
@@ -302,7 +301,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)");

	return -ENODEV;

}
@@ -320,7 +319,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);

}
@@ -516,7 +515,7 @@ int tboot_force_iommu(void) 
		return 1;



	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

arch/x86/kernel/tsc_sync.c

+4 −4
Original line number Diff line number Diff line
@@ -364,12 +364,12 @@ retry: 
		/* 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, "

		pr_warn("Measured %Ld 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");

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE