From 3b4f54b6128d211698fbaf493084e2c6e0abd53f Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue, 19 Feb 2008 08:16:03 +0100
Subject: [PATCH] --- yaml --- r: 86331 b: refs/heads/master c:
 db342d216ba9e060d8c5501eefc1d0a789c9e711 h: refs/heads/master i:   86329:
 38c086a96992b6a92d4bc16d8bff8e2a37b52e6f   86327:
 acdf6eb92d3916462fe1f9906c95b79f3c500d36 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/asm-offsets_32.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5af8159cb6a4..f16b42c2104d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbc34973709eb41b369c304c075cf2069f847012
+refs/heads/master: db342d216ba9e060d8c5501eefc1d0a789c9e711
diff --git a/trunk/arch/x86/kernel/asm-offsets_32.c b/trunk/arch/x86/kernel/asm-offsets_32.c
index a33d53017997..8ea040124f7d 100644
--- a/trunk/arch/x86/kernel/asm-offsets_32.c
+++ b/trunk/arch/x86/kernel/asm-offsets_32.c
@@ -128,13 +128,11 @@ 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) || defined(CONFIG_LGUEST_MODULE)
 	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);