summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-05-17 00:49:10 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-17 00:49:10 +0400
commit137127018812ec7fcccb9843156cfc0b5cfa31d5 (patch)
tree12718f2524a26c5bd26a53518068229d84c41c08 /arch/x86
parent51edbe6a2f47c78c6c6e529999ee0a044fe59a89 (diff)
downloadlinux-137127018812ec7fcccb9843156cfc0b5cfa31d5.tar.xz
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/Makefile1
-rw-r--r--arch/x86/realmode/Makefile1
-rw-r--r--arch/x86/realmode/init.c (renamed from arch/x86/kernel/realmode.c)0
3 files changed, 1 insertions, 1 deletions
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
index 099277984b80..099277984b80 100644
--- a/arch/x86/kernel/realmode.c
+++ b/arch/x86/realmode/init.c