Skip to content

L
linux-davinci
Commit 823b259b authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
arch/x86/kernel/apic.c
View file @ 823b259b
...@@ -1586,7 +1586,7 @@ int __init APIC_init_uniprocessor(void) ...@@ -1586,7 +1586,7 @@ int __init APIC_init_uniprocessor(void)
*/ */
if (!cpu_has_apic && if (!cpu_has_apic &&
APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) { 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); boot_cpu_physical_apicid);
clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
return -1; return -1;
......
arch/x86/kernel/cpu/amd.c
View file @ 823b259b
...@@ -249,7 +249,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) ...@@ -249,7 +249,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
} }
numa_set_node(cpu, node); 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 #endif
} }
......
arch/x86/kernel/cpu/intel.c
View file @ 823b259b
...@@ -174,7 +174,7 @@ static void __cpuinit srat_detect_node(void) ...@@ -174,7 +174,7 @@ static void __cpuinit srat_detect_node(void)
node = first_node(node_online_map); node = first_node(node_online_map);
numa_set_node(cpu, node); 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 #endif
} }
......
arch/x86/kernel/smpboot.c
View file @ 823b259b
...@@ -543,10 +543,10 @@ static inline void __inquire_remote_apic(int apicid) ...@@ -543,10 +543,10 @@ static inline void __inquire_remote_apic(int apicid)
int timeout; int timeout;
u32 status; 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++) { 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. * Wait for idle.
...@@ -874,7 +874,7 @@ do_rest: ...@@ -874,7 +874,7 @@ do_rest:
start_ip = setup_trampoline(); start_ip = setup_trampoline();
/* So we see what's up */ /* 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); cpu, apicid, start_ip);
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment