aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-06-15 14:16:54 +0200
committerIngo Molnar <mingo@kernel.org>2012-06-15 14:17:01 +0200
commit879060d5745250c6f38304fd548d42b76f9df093 (patch)
treef28ad110cb52cc2b4f93aeb552ceb54317efbbfb /arch/x86/kernel/setup.c
parentx86/apic/es7000: Make apicid of a cluster (not CPU) from a cpumask (diff)
parentx86/early_printk: Replace obsolete simple_strtoul() usage with kstrtoint() (diff)
downloadlinux-dev-879060d5745250c6f38304fd548d42b76f9df093.tar.xz
linux-dev-879060d5745250c6f38304fd548d42b76f9df093.zip
Merge branch 'x86/cleanups' into x86/apic
Merge in the cleanups because a followup x86/apic change relies on them. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 16be6dc14db1..f4b9b80e1b95 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1031,8 +1031,6 @@ void __init setup_arch(char **cmdline_p)
x86_init.timers.wallclock_init();
- x86_platform.wallclock_init();
-
mcheck_init();
arch_init_ideal_nops();