Commit:     b8415ec34fd63c6260497b2f8aaf3ce7a61eaa8a
Parent:     fbb43ab03c1fa7587476910d346ee11882b4cc62
Author:     Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 28 16:22:09 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Nov 29 09:24:55 2007 -0800

    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 
    (and of course, this happens because kconfig does not follow dependencies
    when [evil] select is used...)
    Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
    Cc: Rusty Russell <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/x86/lguest/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index c4dffbe..19626ac 100644
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -2,6 +2,7 @@ config LGUEST_GUEST
        bool "Lguest guest support"
        select PARAVIRT
        depends on !X86_PAE
+       depends on !(X86_VISWS || X86_VOYAGER)
        select VIRTIO
        select VIRTIO_RING
        select VIRTIO_CONSOLE
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to