diff options
Diffstat (limited to 'arch/x86_64/kernel/smpboot.c')
-rw-r--r-- | arch/x86_64/kernel/smpboot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index e66edfa1f3b9..e773a794ec45 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
@@ -285,7 +285,7 @@ static __cpuinit void sync_tsc(void) | |||
285 | int i, done = 0; | 285 | int i, done = 0; |
286 | long delta, adj, adjust_latency = 0; | 286 | long delta, adj, adjust_latency = 0; |
287 | unsigned long flags, rt, master_time_stamp, bound; | 287 | unsigned long flags, rt, master_time_stamp, bound; |
288 | #if DEBUG_TSC_SYNC | 288 | #ifdef DEBUG_TSC_SYNC |
289 | static struct syncdebug { | 289 | static struct syncdebug { |
290 | long rt; /* roundtrip time */ | 290 | long rt; /* roundtrip time */ |
291 | long master; /* master's timestamp */ | 291 | long master; /* master's timestamp */ |
@@ -321,7 +321,7 @@ static __cpuinit void sync_tsc(void) | |||
321 | rdtscll(t); | 321 | rdtscll(t); |
322 | wrmsrl(MSR_IA32_TSC, t + adj); | 322 | wrmsrl(MSR_IA32_TSC, t + adj); |
323 | } | 323 | } |
324 | #if DEBUG_TSC_SYNC | 324 | #ifdef DEBUG_TSC_SYNC |
325 | t[i].rt = rt; | 325 | t[i].rt = rt; |
326 | t[i].master = master_time_stamp; | 326 | t[i].master = master_time_stamp; |
327 | t[i].diff = delta; | 327 | t[i].diff = delta; |
@@ -331,7 +331,7 @@ static __cpuinit void sync_tsc(void) | |||
331 | } | 331 | } |
332 | spin_unlock_irqrestore(&tsc_sync_lock, flags); | 332 | spin_unlock_irqrestore(&tsc_sync_lock, flags); |
333 | 333 | ||
334 | #if DEBUG_TSC_SYNC | 334 | #ifdef DEBUG_TSC_SYNC |
335 | for (i = 0; i < NUM_ROUNDS; ++i) | 335 | for (i = 0; i < NUM_ROUNDS; ++i) |
336 | printk("rt=%5ld master=%5ld diff=%5ld adjlat=%5ld\n", | 336 | printk("rt=%5ld master=%5ld diff=%5ld adjlat=%5ld\n", |
337 | t[i].rt, t[i].master, t[i].diff, t[i].lat); | 337 | t[i].rt, t[i].master, t[i].diff, t[i].lat); |
@@ -537,7 +537,7 @@ void __cpuinit start_secondary(void) | |||
537 | extern volatile unsigned long init_rsp; | 537 | extern volatile unsigned long init_rsp; |
538 | extern void (*initial_code)(void); | 538 | extern void (*initial_code)(void); |
539 | 539 | ||
540 | #if APIC_DEBUG | 540 | #ifdef APIC_DEBUG |
541 | static void inquire_remote_apic(int apicid) | 541 | static void inquire_remote_apic(int apicid) |
542 | { | 542 | { |
543 | unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; | 543 | unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; |
@@ -841,7 +841,7 @@ do_rest: | |||
841 | else | 841 | else |
842 | /* trampoline code not run */ | 842 | /* trampoline code not run */ |
843 | printk("Not responding.\n"); | 843 | printk("Not responding.\n"); |
844 | #if APIC_DEBUG | 844 | #ifdef APIC_DEBUG |
845 | inquire_remote_apic(apicid); | 845 | inquire_remote_apic(apicid); |
846 | #endif | 846 | #endif |
847 | } | 847 | } |