summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baluta <dbaluta@ixiacom.com>2013-05-20 10:25:39 +0930
committerRusty Russell <rusty@rustcorp.com.au>2013-05-20 12:09:40 +0930
commit6865b32a865c76bfa02be383b52041b942cb232b (patch)
tree30ce39433ddf893191c62ce59b95a100c372f5fe
parent2a647bfe1bf43af51530862b9ec70032bdd0a44c (diff)
downloadlinux-6865b32a865c76bfa02be383b52041b942cb232b.tar.bz2
lguest: rename i386_head.S
Since commit 9a163ed8e0 (i386: move kernel) kernel/i386_head.S was renamed to kernel/head_32.S. We do the same for lguest/i386_head.S. Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--arch/x86/lguest/Makefile2
-rw-r--r--arch/x86/lguest/head_32.S (renamed from arch/x86/lguest/i386_head.S)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lguest/Makefile b/arch/x86/lguest/Makefile
index 94e0e54056a9..8f38d577a2fa 100644
--- a/arch/x86/lguest/Makefile
+++ b/arch/x86/lguest/Makefile
@@ -1,2 +1,2 @@
-obj-y := i386_head.o boot.o
+obj-y := head_32.o boot.o
CFLAGS_boot.o := $(call cc-option, -fno-stack-protector)
diff --git a/arch/x86/lguest/i386_head.S b/arch/x86/lguest/head_32.S
index 6ddfe4fc23c3..6ddfe4fc23c3 100644
--- a/arch/x86/lguest/i386_head.S
+++ b/arch/x86/lguest/head_32.S