From c8eda4622554a43bf29c5fcb3a879b902ff36454 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 19 Sep 2009 11:07:57 -0700 Subject: [PATCH] --- yaml --- r: 164297 b: refs/heads/master c: eda6da9286ad5b35b1eb70f6368958a8ee41a9dd h: refs/heads/master i: 164295: 9deb8a48ed78146603b16202015297f925236e1e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup.c | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 4d56f944863b..a9ad40f4b06f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a017421ddcdf34474f1133b27e33ab2ca6c19b96 +refs/heads/master: eda6da9286ad5b35b1eb70f6368958a8ee41a9dd diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index 19f15c4076fb..f5baa2ae0c87 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -712,21 +712,6 @@ void __init setup_arch(char **cmdline_p) printk(KERN_INFO "Command line: %s\n", boot_command_line); #endif - strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); - *cmdline_p = command_line; - -#ifdef CONFIG_X86_64 - /* - * Must call this twice: Once just to detect whether hardware doesn't - * support NX (so that the early EHCI debug console setup can safely - * call set_fixmap(), and then again after parsing early parameters to - * honor the respective command line option. - */ - check_efer(); -#endif - - parse_early_param(); - /* VMI may relocate the fixmap; do this before touching ioremap area */ vmi_init(); @@ -809,6 +794,21 @@ void __init setup_arch(char **cmdline_p) #endif #endif + strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + *cmdline_p = command_line; + +#ifdef CONFIG_X86_64 + /* + * Must call this twice: Once just to detect whether hardware doesn't + * support NX (so that the early EHCI debug console setup can safely + * call set_fixmap(), and then again after parsing early parameters to + * honor the respective command line option. + */ + check_efer(); +#endif + + parse_early_param(); + #ifdef CONFIG_X86_64 check_efer(); #endif