Commit f0f32fcc authored by Randy Dunlap's avatar Randy Dunlap Committed by Andi Kleen

[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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
parent 306a22c2
...@@ -190,6 +190,7 @@ endchoice ...@@ -190,6 +190,7 @@ endchoice
config PARAVIRT config PARAVIRT
bool "Paravirtualization support (EXPERIMENTAL)" bool "Paravirtualization support (EXPERIMENTAL)"
depends on EXPERIMENTAL depends on EXPERIMENTAL
depends on !(X86_VISWS || X86_VOYAGER)
help help
Paravirtualization is a way of running multiple instances of Paravirtualization is a way of running multiple instances of
Linux on the same machine, under a hypervisor. This option Linux on the same machine, under a hypervisor. This option
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment