---

yaml --- r: 72246 b: refs/heads/master c: 1f4e1de h: refs/heads/master v: v3
git-mirror · Oct 23, 2007 · 55103d9 · 55103d9
1 parent 96cea55
commit 55103d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34b8867a034364ca33d0adb3a1c5b9982903c719
+refs/heads/master: 1f4e1de4f23e158abf976a76e1d0fce6e39b532a
diff --git a/trunk/drivers/lguest/Makefile b/trunk/drivers/lguest/Makefile
@@ -3,8 +3,10 @@ obj-$(CONFIG_LGUEST_GUEST) += lguest_bus.o
 
 # Host requires the other files, which can be a module.
 obj-$(CONFIG_LGUEST)	+= lg.o
-lg-y := core.o hypercalls.o page_tables.o interrupts_and_traps.o \
-	segments.o io.o lguest_user.o switcher.o
+lg-y = core.o hypercalls.o page_tables.o interrupts_and_traps.o \
+	segments.o io.o lguest_user.o
+
+lg-$(CONFIG_X86_32) += x86/switcher_32.o
 
 Preparation Preparation!: PREFIX=P
 Guest: PREFIX=G

diff --git a/trunk/drivers/lguest/switcher.S → trunk/drivers/lguest/x86/switcher_32.S b/trunk/drivers/lguest/switcher.S → trunk/drivers/lguest/x86/switcher_32.S
@@ -48,7 +48,7 @@
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/page.h>
-#include "lg.h"
+#include "../lg.h"
 
 // We mark the start of the code to copy
 // It's placed in .text tho it's never run here