Browse Source

lguest: prevent VISWS or VOYAGER randconfigs

Keep lguest from being enabled on VISWS or VOYAGER configs, just as is
already done for VMI and XEN.  Otherwise randconfigs with VISWS and LGUEST
have this problem:

In file included from arch/x86/kernel/setup_32.c:61:
include/asm-x86/mach-visws/setup_arch.h:8:1: warning: "ARCH_SETUP" redefined
In file included from include/asm/msr.h:80,
                 from include/asm/processor_32.h:17,
                 from include/asm/processor.h:2,
                 from include/asm/thread_info_32.h:16,
                 from include/asm/thread_info.h:2,
                 from include/linux/thread_info.h:21,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:49,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:57,
                 from include/linux/sched.h:53,
                 from arch/x86/kernel/setup_32.c:24:
include/asm/paravirt.h:458:1: warning: this is the location of the previous definition

(and of course, this happens because kconfig does not follow dependencies
when [evil] select is used...)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Randy Dunlap 17 years ago
parent
commit
b8415ec34f
1 changed files with 1 additions and 0 deletions
  1. 1 0
      arch/x86/lguest/Kconfig

+ 1 - 0
arch/x86/lguest/Kconfig

@@ -2,6 +2,7 @@ config LGUEST_GUEST
 	bool "Lguest guest support"
 	bool "Lguest guest support"
 	select PARAVIRT
 	select PARAVIRT
 	depends on !X86_PAE
 	depends on !X86_PAE
+	depends on !(X86_VISWS || X86_VOYAGER)
 	select VIRTIO
 	select VIRTIO
 	select VIRTIO_RING
 	select VIRTIO_RING
 	select VIRTIO_CONSOLE
 	select VIRTIO_CONSOLE