* Ingo Molnar <[EMAIL PROTECTED]> wrote:
> > +#endif
> > +
> > +#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_MODULE)
> > + BLANK();
>
> hm. Rusty's original fix is now upstream. I've done a delta to your
> patch, find the fix is below.
the right one is below. There's no 'LGUEST_MODULE' anymore -
'LGUEST_GUEST' is what should be used.
Ingo
------------------->
Subject: lguest: fix build breakage
From: Tony Breeds <[EMAIL PROTECTED]>
Date: Tue Feb 19 08:16:03 CET 2008
[ [EMAIL PROTECTED]: merged to Rusty's patch ]
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
arch/x86/kernel/asm-offsets_32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-x86.q/arch/x86/kernel/asm-offsets_32.c
===================================================================
--- linux-x86.q.orig/arch/x86/kernel/asm-offsets_32.c
+++ linux-x86.q/arch/x86/kernel/asm-offsets_32.c
@@ -128,7 +128,7 @@ void foo(void)
OFFSET(XEN_vcpu_info_pending, vcpu_info, evtchn_upcall_pending);
#endif
-#ifdef CONFIG_LGUEST_GUEST
+#if defined(CONFIG_LGUEST) || defined(CONFIG_LGUEST_GUEST)
BLANK();
OFFSET(LGUEST_DATA_irq_enabled, lguest_data, irq_enabled);
OFFSET(LGUEST_DATA_pgdir, lguest_data, pgdir);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
