diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (patch) | |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d /arch/x86/kernel/setup.c | |
| parent | cc511b8d84d88ab788cddbfe8d21485b1c387493 (diff) | |
| parent | 2e3d256de9d3db5a7ca19b61305627a516b54b45 (diff) | |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts:
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index afaf38447ef5..cf0ef986cb6d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -1045,6 +1045,8 @@ void __init setup_arch(char **cmdline_p) | |||
| 1045 | 1045 | ||
| 1046 | x86_init.timers.wallclock_init(); | 1046 | x86_init.timers.wallclock_init(); |
| 1047 | 1047 | ||
| 1048 | x86_platform.wallclock_init(); | ||
| 1049 | |||
| 1048 | mcheck_init(); | 1050 | mcheck_init(); |
| 1049 | 1051 | ||
| 1050 | arch_init_ideal_nops(); | 1052 | arch_init_ideal_nops(); |