]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
2 | Subject: Linux 2.6.27.10 | |
3 | ||
4 | Upstream 2.6.27.10 release from kernel.org | |
5 | ||
6 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
7 | ||
8 | Automatically created from "patches.kernel.org/patch-2.6.27.9-10" by xen-port-patches.py | |
9 | ||
10 | --- head-2008-12-23.orig/arch/x86/kernel/setup-xen.c 2008-12-08 13:33:35.000000000 +0100 | |
11 | +++ head-2008-12-23/arch/x86/kernel/setup-xen.c 2008-12-23 09:40:12.000000000 +0100 | |
12 | @@ -726,6 +726,9 @@ void __init setup_arch(char **cmdline_p) | |
13 | printk(KERN_INFO "Command line: %s\n", boot_command_line); | |
14 | #endif | |
15 | ||
16 | + /* VMI may relocate the fixmap; do this before touching ioremap area */ | |
17 | + vmi_init(); | |
18 | + | |
19 | early_cpu_init(); | |
20 | early_ioremap_init(); | |
21 | ||
22 | @@ -829,13 +832,8 @@ void __init setup_arch(char **cmdline_p) | |
23 | check_efer(); | |
24 | #endif | |
25 | ||
26 | -#if defined(CONFIG_VMI) && defined(CONFIG_X86_32) | |
27 | - /* | |
28 | - * Must be before kernel pagetables are setup | |
29 | - * or fixmap area is touched. | |
30 | - */ | |
31 | - vmi_init(); | |
32 | -#endif | |
33 | + /* Must be before kernel pagetables are setup */ | |
34 | + vmi_activate(); | |
35 | ||
36 | /* after early param, so could get panic from serial */ | |
37 | reserve_early_setup_data(); |