>From 03ac444d1ab4446c587e8180ceaba60b9e75b28d Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
Date: Fri, 11 Jul 2008 10:13:08 +0800
Subject: [PATCH] KVM: external module: Moving x86-speicif files to x86
directory.
Create x86 directory to hold x86-specific files.
Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
kernel/Kbuild | 10 +++++-----
kernel/Makefile | 2 +-
kernel/{ => x86}/anon_inodes.c | 0
kernel/{ => x86}/debug.h | 0
kernel/{ => x86}/external-module-compat.c | 0
kernel/{ => x86}/external-module-compat.h | 0
kernel/{ => x86}/preempt.c | 0
kernel/{ => x86}/vmx-debug.c | 0
8 files changed, 6 insertions(+), 6 deletions(-)
rename kernel/{ => x86}/anon_inodes.c (100%)
rename kernel/{ => x86}/debug.h (100%)
rename kernel/{ => x86}/external-module-compat.c (100%)
rename kernel/{ => x86}/external-module-compat.h (100%)
rename kernel/{ => x86}/preempt.c (100%)
rename kernel/{ => x86}/vmx-debug.c (100%)
diff --git a/kernel/Kbuild b/kernel/Kbuild
index 676f28d..de56aec 100644
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -1,11 +1,11 @@
obj-m := kvm.o kvm-intel.o kvm-amd.o
-kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o anon_inodes.o irq.o
i8259.o \
- lapic.o ioapic.o preempt.o i8254.o coalesced_mmio.o \
- external-module-compat.o
+kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o x86/anon_inodes.o
irq.o i8259.o \
+ lapic.o ioapic.o x86/preempt.o i8254.o coalesced_mmio.o \
+ x86/external-module-compat.o
ifeq ($(CONFIG_KVM_TRACE),y)
kvm-objs += kvm_trace.o
endif
-kvm-intel-objs := vmx.o vmx-debug.o external-module-compat.o
-kvm-amd-objs := svm.o external-module-compat.o
+kvm-intel-objs := vmx.o x86/vmx-debug.o x86/external-module-compat.o
+kvm-amd-objs := svm.o x86/external-module-compat.o
CFLAGS_kvm_main.o = -DKVM_MAIN
diff --git a/kernel/Makefile b/kernel/Makefile
index 69b4981..c2c666e 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -35,7 +35,7 @@ all::
$(MAKE) -C $(KERNELDIR) M=`pwd` \
LINUXINCLUDE="-I`pwd`/include -Iinclude
-I`pwd`/include-compat \
-include include/linux/autoconf.h \
- -include `pwd`/external-module-compat.h"
+ -include `pwd`/$(ARCH_DIR)/external-module-compat.h"
"$$@"
sync: header-sync source-sync
diff --git a/kernel/anon_inodes.c b/kernel/x86/anon_inodes.c
similarity index 100%
rename from kernel/anon_inodes.c
rename to kernel/x86/anon_inodes.c
diff --git a/kernel/debug.h b/kernel/x86/debug.h
similarity index 100%
rename from kernel/debug.h
rename to kernel/x86/debug.h
diff --git a/kernel/external-module-compat.c
b/kernel/x86/external-module-compat.c
similarity index 100%
rename from kernel/external-module-compat.c
rename to kernel/x86/external-module-compat.c
diff --git a/kernel/external-module-compat.h
b/kernel/x86/external-module-compat.h
similarity index 100%
rename from kernel/external-module-compat.h
rename to kernel/x86/external-module-compat.h
diff --git a/kernel/preempt.c b/kernel/x86/preempt.c
similarity index 100%
rename from kernel/preempt.c
rename to kernel/x86/preempt.c
diff --git a/kernel/vmx-debug.c b/kernel/x86/vmx-debug.c
similarity index 100%
rename from kernel/vmx-debug.c
rename to kernel/x86/vmx-debug.c
--
1.5.2
Attachment:
0001-KVM-external-module-Moving-x86-speicif-files-to-x8.patch
Description: 0001-KVM-external-module-Moving-x86-speicif-files-to-x8.patch
