diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:11:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:11:09 -0700 |
| commit | 06d4a22be3af824cfcbf53ac84d95bd700a949c2 (patch) | |
| tree | 5cf12980b8ad39b66f4c400fae062330d63d561c /arch/x86/kernel/setup.c | |
| parent | b9719635f85b1d3c54775b53ea45fdd8e7496682 (diff) | |
| parent | ba0593bf553c450a03dbc5f8c1f0ff58b778a0c8 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: completely disable NOPL on 32 bits
x86/paravirt: Remove duplicate paravirt_pagetable_setup_{start, done}()
xen: fix for xen guest with mem > 3.7G
x86: fix possible x86_64 and EFI regression
arch/x86/kernel/kdebugfs.c: introduce missing kfree
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 362d4e7f2d38..9838f2539dfc 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -670,6 +670,10 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); +#ifdef CONFIG_X86_64 + check_efer(); +#endif + #if defined(CONFIG_VMI) && defined(CONFIG_X86_32) /* * Must be before kernel pagetables are setup @@ -738,7 +742,6 @@ void __init setup_arch(char **cmdline_p) #else num_physpages = max_pfn; - check_efer(); /* How many end-of-memory variables you have, grandma! */ /* need this before calling reserve_initrd */ |