From 137127018812ec7fcccb9843156cfc0b5cfa31d5 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Wed, 16 May 2012 13:49:10 -0700
Subject: [PATCH] x86, realmode: Move kernel/realmode.c to realmode/init.c

Keep all the realmode code together, including initialization (only
the rm/ subdirectory is actually built as real-mode code, anyway.)

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
---
 arch/x86/kernel/Makefile                        | 1 -
 arch/x86/realmode/Makefile                      | 1 +
 arch/x86/{kernel/realmode.c => realmode/init.c} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/x86/{kernel/realmode.c => realmode/init.c} (100%)

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 4a20f4441ffe..08484332f329 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -35,7 +35,6 @@ obj-y			+= tsc.o io_delay.o rtc.o
 obj-y			+= pci-iommu_table.o
 obj-y			+= resource.o
 
-obj-y				+= realmode.o
 obj-y				+= process.o
 obj-y				+= i387.o xsave.o
 obj-y				+= ptrace.o
diff --git a/arch/x86/realmode/Makefile b/arch/x86/realmode/Makefile
index a05b3aca64ad..94f7fbe97b08 100644
--- a/arch/x86/realmode/Makefile
+++ b/arch/x86/realmode/Makefile
@@ -9,6 +9,7 @@
 
 subdir- := rm
 
+obj-y += init.o
 obj-y += rmpiggy.o
 
 $(obj)/rmpiggy.o: $(obj)/rm/realmode.bin
diff --git a/arch/x86/kernel/realmode.c b/arch/x86/realmode/init.c
similarity index 100%
rename from arch/x86/kernel/realmode.c
rename to arch/x86/realmode/init.c
-- 
2.34.1