From: Rusty Russell Date: Mon, 22 Oct 2007 01:03:25 +0000 (+1000) Subject: Rename switcher.S to x86/switcher_32.S X-Git-Tag: v2.6.24-rc1~28^2~31 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1f4e1de4f23e158abf976a76e1d0fce6e39b532a;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile index 2db98c233e5..a4567c99991 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 similarity index 99% rename from drivers/lguest/switcher.S rename to drivers/lguest/x86/switcher_32.S index 7c9c230cc84..a3d23f79cba 100644 --- a/drivers/lguest/switcher.S +++ b/drivers/lguest/x86/switcher_32.S @@ -48,7 +48,7 @@ #include #include #include -#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