]>
Commit | Line | Data |
---|---|---|
cc90b958 BS |
1 | Subject: Fix xen configuration. |
2 | From: jbeulich@novell.com | |
3 | Patch-mainline: obsolete | |
4 | ||
5 | Index: head-2008-10-24/arch/x86/Kconfig | |
6 | =================================================================== | |
7 | --- head-2008-10-24.orig/arch/x86/Kconfig 2008-10-24 10:43:32.000000000 +0200 | |
8 | +++ head-2008-10-24/arch/x86/Kconfig 2008-10-24 10:44:52.000000000 +0200 | |
9 | @@ -137,6 +137,7 @@ config HAVE_CPUMASK_OF_CPU_MAP | |
10 | config ARCH_HIBERNATION_POSSIBLE | |
11 | def_bool y | |
12 | depends on !SMP || !X86_VOYAGER | |
13 | + depends on !XEN | |
14 | ||
15 | config ARCH_SUSPEND_POSSIBLE | |
16 | def_bool y | |
17 | @@ -195,7 +196,7 @@ config X86_HT | |
18 | ||
19 | config X86_BIOS_REBOOT | |
20 | bool | |
21 | - depends on !X86_VOYAGER | |
22 | + depends on !X86_VOYAGER && !XEN | |
23 | default y | |
24 | ||
25 | config X86_TRAMPOLINE | |
26 | Index: head-2008-10-24/drivers/xen/Kconfig | |
27 | =================================================================== | |
28 | --- head-2008-10-24.orig/drivers/xen/Kconfig 2008-10-24 10:43:32.000000000 +0200 | |
29 | +++ head-2008-10-24/drivers/xen/Kconfig 2008-10-24 10:44:52.000000000 +0200 | |
30 | @@ -22,6 +22,9 @@ config XEN_PRIVILEGED_GUEST | |
31 | ||
32 | config XEN_UNPRIVILEGED_GUEST | |
33 | def_bool !XEN_PRIVILEGED_GUEST | |
34 | + select PM | |
35 | + select PM_SLEEP | |
36 | + select PM_SLEEP_SMP if SMP | |
37 | ||
38 | config XEN_PRIVCMD | |
39 | def_bool y |