Commit 823b259b authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: print out apic id in hex format 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 87783be4

arch/x86/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1586,7 +1586,7 @@ int __init APIC_init_uniprocessor(void) 
	 */

	if (!cpu_has_apic &&

	    APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {

		printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",

		printk(KERN_ERR "BIOS bug, local APIC 0x%x not detected!...\n",

		       boot_cpu_physical_apicid);

		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

		return -1;

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) 
	}

	numa_set_node(cpu, node);



	printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node);

	printk(KERN_INFO "CPU %d/0x%x -> Node %d\n", cpu, apicid, node);

#endif

}

arch/x86/kernel/cpu/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void __cpuinit srat_detect_node(void) 
		node = first_node(node_online_map);

	numa_set_node(cpu, node);



	printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node);

	printk(KERN_INFO "CPU %d/0x%x -> Node %d\n", cpu, apicid, node);

#endif

}

arch/x86/kernel/smpboot.c

+3 −3
Original line number Diff line number Diff line
@@ -543,10 +543,10 @@ static inline void __inquire_remote_apic(int apicid) 
	int timeout;

	u32 status;



	printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid);

	printk(KERN_INFO "Inquiring remote APIC 0x%x...\n", apicid);



	for (i = 0; i < ARRAY_SIZE(regs); i++) {

		printk(KERN_INFO "... APIC #%d %s: ", apicid, names[i]);

		printk(KERN_INFO "... APIC 0x%x %s: ", apicid, names[i]);



		/*

		 * Wait for idle.
@@ -874,7 +874,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) 
	start_ip = setup_trampoline();



	/* So we see what's up   */

	printk(KERN_INFO "Booting processor %d/%d ip %lx\n",

	printk(KERN_INFO "Booting processor %d APIC 0x%x ip 0x%lx\n",

			  cpu, apicid, start_ip);



	/*