From 23510bf039cb49e6a1682655d3312afb1f73a818 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 16 May 2012 13:49:10 -0700 Subject: [PATCH] --- yaml --- r: 309168 b: refs/heads/master c: 137127018812ec7fcccb9843156cfc0b5cfa31d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/realmode/Makefile | 1 + trunk/arch/x86/{kernel/realmode.c => realmode/init.c} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86/{kernel/realmode.c => realmode/init.c} (100%) diff --git a/[refs] b/[refs] index fc3b688705aa..70236ec3090f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51edbe6a2f47c78c6c6e529999ee0a044fe59a89 +refs/heads/master: 137127018812ec7fcccb9843156cfc0b5cfa31d5 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 4a20f4441ffe..08484332f329 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/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/trunk/arch/x86/realmode/Makefile b/trunk/arch/x86/realmode/Makefile index a05b3aca64ad..94f7fbe97b08 100644 --- a/trunk/arch/x86/realmode/Makefile +++ b/trunk/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/trunk/arch/x86/kernel/realmode.c b/trunk/arch/x86/realmode/init.c similarity index 100% rename from trunk/arch/x86/kernel/realmode.c rename to trunk/arch/x86/realmode/init.c