git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'origin'
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
smpboot.c
diff --git
a/arch/x86_64/kernel/smpboot.c
b/arch/x86_64/kernel/smpboot.c
index
67e4e28
..
66e9865
100644
(file)
--- a/
arch/x86_64/kernel/smpboot.c
+++ b/
arch/x86_64/kernel/smpboot.c
@@
-1152,8
+1152,6
@@
void __init smp_cpus_done(unsigned int max_cpus)
setup_ioapic_dest();
#endif
setup_ioapic_dest();
#endif
- time_init_gtod();
-
check_nmi_watchdog();
}
check_nmi_watchdog();
}
@@
-1244,7
+1242,7
@@
void __cpu_die(unsigned int cpu)
printk(KERN_ERR "CPU %u didn't die...\n", cpu);
}
printk(KERN_ERR "CPU %u didn't die...\n", cpu);
}
-
static
__init int setup_additional_cpus(char *s)
+__init int setup_additional_cpus(char *s)
{
return get_option(&s, &additional_cpus);
}
{
return get_option(&s, &additional_cpus);
}