Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f6c540cdd65d4bc4eaf4dcbf652580f09f3b0c38
Commit:     f6c540cdd65d4bc4eaf4dcbf652580f09f3b0c38
Parent:     b7ad149d62ffffaccb9f565dfe7e5bae739d6836
Author:     Rusty Russell <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 07:11:10 2008 +1100
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Mon Feb 18 20:54:14 2008 +0100

    x86: fix lguest build failure
    
    drivers/lguest/x86/switcher_32.S:(.text+0x3815f8):
        undefined reference to `LGUEST_PAGES_regs_trapnum'
    
    This problem was caused by asm-offsets.c only having the offsets when
    lguest *guest* support was set, not lguest host (host support used to
    imply guest support, so now they're separate these bugs come out).
    
    Lguest guest support and host support are separate config options:
    they used to be tied together. Sort out which parts of asm-offsets are
    needed for Guest and Host.
    
    Signed-off-by: Rusty Russell <[EMAIL PROTECTED]>
    Cc: Linus Torvalds <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 arch/x86/kernel/asm-offsets_32.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index afd8446..a33d530 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -20,10 +20,8 @@
 
 #include <xen/interface/xen.h>
 
-#ifdef CONFIG_LGUEST_GUEST
 #include <linux/lguest.h>
 #include "../../../drivers/lguest/lg.h"
-#endif
 
 #define DEFINE(sym, val) \
         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -134,6 +132,10 @@ void foo(void)
        BLANK();
        OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
        OFFSET(LGUEST_DATA_pgdir, lguest_data, pgdir);
+#endif
+
+#ifdef CONFIG_LGUEST
+       BLANK();
        OFFSET(LGUEST_PAGES_host_gdt_desc, lguest_pages, state.host_gdt_desc);
        OFFSET(LGUEST_PAGES_host_idt_desc, lguest_pages, state.host_idt_desc);
        OFFSET(LGUEST_PAGES_host_cr3, lguest_pages, state.host_cr3);
-
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  http://vger.kernel.org/majordomo-info.html

Reply via email to