diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-22 11:03:25 +1000 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-23 15:49:50 +1000 |
| commit | 1f4e1de4f23e158abf976a76e1d0fce6e39b532a (patch) | |
| tree | 273ed888c82023888c5de00b6a36cd885ff47859 | |
| parent | 34b8867a034364ca33d0adb3a1c5b9982903c719 (diff) | |
Rename switcher.S to x86/switcher_32.S
lguest uses a "switcher" shim mapped high to bounce between host and
guest. As lguest becomes less i386-centric, we separate this code
into a subdir.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | drivers/lguest/Makefile | 6 | ||||
| -rw-r--r-- | drivers/lguest/x86/switcher_32.S (renamed from drivers/lguest/switcher.S) | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile index 2db98c233e54..a4567c99991b 100644 --- a/drivers/lguest/Makefile +++ b/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/drivers/lguest/switcher.S b/drivers/lguest/x86/switcher_32.S index 7c9c230cc845..a3d23f79cba4 100644 --- a/drivers/lguest/switcher.S +++ b/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 |