From: Andrew Morton <akpm@osdl.org>

Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/time.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN arch/x86_64/kernel/time.c~x86_64-move-apic-init-in-init_irqs-take-2-tidy arch/x86_64/kernel/time.c
--- devel/arch/x86_64/kernel/time.c~x86_64-move-apic-init-in-init_irqs-take-2-tidy	2005-10-11 20:32:08.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/time.c	2005-10-11 20:32:08.000000000 -0700
@@ -1307,9 +1307,8 @@ void __init time_init(void)
 	set_cyc2ns_scale(cpu_khz);
 
 #if CONFIG_X86_LOCAL_APIC
-	if (!disable_apic) {
+	if (!disable_apic)
 		late_time_init = APIC_late_time_init;
-	}
 #endif
 #ifndef CONFIG_SMP
 	time_init_gtod();
_