Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap at oracle.com> > > 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" redefined > 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" redefined > 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 at oracle.com> > --- > arch/i386/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > --- linux-2.6.19-git13.orig/arch/i386/Kconfig > +++ linux-2.6.19-git13/arch/i386/Kconfig > @@ -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 > > > --- > > Acked-by: Zachary Amsden <zach at vmware.com>
