diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-09 15:33:36 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-09 15:33:36 -0500 |
| commit | f0f32fccbffaaba8596d5c671153aa37aea9d4f0 (patch) | |
| tree | fcffeb4c39cce213b3e4680f6ee894998871ecf0 | |
| parent | 306a22c2a20edf3a440bfb4cf2b94c19dfd81a53 (diff) | |
[PATCH] x86-64: no paravirt for X86_VOYAGER or X86_VISWS
Since Voyager and Visual WS already define ARCH_SETUP,
it looks like PARAVIRT shouldn't be offered for them.
In file included from arch/i386/kernel/setup.c:63:
include/asm-i386/mach-visws/setup_arch.h:8:1: warning: "ARCH_SETUP" redefin=
ed
In file included from include/asm/msr.h:5,
from include/asm/processor.h:17,
from include/asm/thread_info.h:16,
from include/linux/thread_info.h:21,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:49,
from include/linux/capability.h:45,
from include/linux/sched.h:46,
from arch/i386/kernel/setup.c:26:
include/asm/paravirt.h:163:1: warning: this is the location of the previous=
definition
In file included from arch/i386/kernel/setup.c:63:
include/asm-i386/mach-visws/setup_arch.h:8:1: warning: "ARCH_SETUP" redefin=
ed
In file included from include/asm/msr.h:5,
from include/asm/processor.h:17,
from include/asm/thread_info.h:16,
from include/linux/thread_info.h:21,
from include/linux/preempt.h:9,
from include/linux/spinlock.h:49,
from include/linux/capability.h:45,
from include/linux/sched.h:46,
from arch/i386/kernel/setup.c:26:
include/asm/paravirt.h:163:1: warning: this is the location of the previous=
definition
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
| -rw-r--r-- | arch/i386/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index c2362c7ba749..0d67a0a1151e 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -190,6 +190,7 @@ endchoice | |||
| 190 | config PARAVIRT | 190 | config PARAVIRT |
| 191 | bool "Paravirtualization support (EXPERIMENTAL)" | 191 | bool "Paravirtualization support (EXPERIMENTAL)" |
| 192 | depends on EXPERIMENTAL | 192 | depends on EXPERIMENTAL |
| 193 | depends on !(X86_VISWS || X86_VOYAGER) | ||
| 193 | help | 194 | help |
| 194 | Paravirtualization is a way of running multiple instances of | 195 | Paravirtualization is a way of running multiple instances of |
| 195 | Linux on the same machine, under a hypervisor. This option | 196 | Linux on the same machine, under a hypervisor. This option |