[PATCH] x86-64: no paravirt for X86_VOYAGER or X86_VISWS
authorRandy Dunlap <randy.dunlap@oracle.com>
Sat, 9 Dec 2006 20:33:36 +0000 (21:33 +0100)
committerAndi Kleen <andi@basil.nowhere.org>
Sat, 9 Dec 2006 20:33:36 +0000 (21:33 +0100)
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>
arch/i386/Kconfig

index c2362c7ba74926580b9614eb19a69252ac504a82..0d67a0a1151e8ef263ae67d1489ea5ad98f8a1d4 100644 (file)
@@ -190,6 +190,7 @@ endchoice
 config PARAVIRT
        bool "Paravirtualization support (EXPERIMENTAL)"
        depends on EXPERIMENTAL
+       depends on !(X86_VISWS || X86_VOYAGER)
        help
          Paravirtualization is a way of running multiple instances of
          Linux on the same machine, under a hypervisor.  This option