---

yaml --- r: 197764 b: refs/heads/master c: 2191d65 h: refs/heads/master v: v3
git-mirror · May 17, 2010 · 43c11c0 · 43c11c0
1 parent b397e33
commit 43c11c0
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77a1a715707d0f60ce0cfbe44070527a0a561f01
+refs/heads/master: 2191d657c9eaa4c444c33e014199ed9de1ac339d
diff --git a/trunk/arch/powerpc/include/asm/kvm_book3s.h b/trunk/arch/powerpc/include/asm/kvm_book3s.h
@@ -22,7 +22,7 @@
 
 #include <linux/types.h>
 #include <linux/kvm_host.h>
-#include <asm/kvm_book3s_64_asm.h>
+#include <asm/kvm_book3s_asm.h>
 
 struct kvmppc_slb {
 	u64 esid;

diff --git a/...h/powerpc/include/asm/kvm_book3s_64_asm.h → ...arch/powerpc/include/asm/kvm_book3s_asm.h b/...h/powerpc/include/asm/kvm_book3s_64_asm.h → ...arch/powerpc/include/asm/kvm_book3s_asm.h
diff --git a/trunk/arch/powerpc/include/asm/paca.h b/trunk/arch/powerpc/include/asm/paca.h
@@ -23,7 +23,7 @@
 #include <asm/page.h>
 #include <asm/exception-64e.h>
 #ifdef CONFIG_KVM_BOOK3S_64_HANDLER
-#include <asm/kvm_book3s_64_asm.h>
+#include <asm/kvm_book3s_asm.h>
 #endif
 
 register struct paca_struct *local_paca asm("r13");

diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S
@@ -37,7 +37,7 @@
 #include <asm/firmware.h>
 #include <asm/page_64.h>
 #include <asm/irqflags.h>
-#include <asm/kvm_book3s_64_asm.h>
+#include <asm/kvm_book3s_asm.h>
 
 /* The physical memory is layed out such that the secondary processor
  * spin code sits at 0x0000...0x00ff. On server, the vectors follow
@@ -169,7 +169,7 @@ exception_marker:
 /* KVM trampoline code needs to be close to the interrupt handlers */
 
 #ifdef CONFIG_KVM_BOOK3S_64_HANDLER
-#include "../kvm/book3s_64_rmhandlers.S"
+#include "../kvm/book3s_rmhandlers.S"
 #endif
 
 _GLOBAL(generic_secondary_thread_init)

diff --git a/trunk/arch/powerpc/kvm/Makefile b/trunk/arch/powerpc/kvm/Makefile
@@ -14,7 +14,7 @@ CFLAGS_emulate.o  := -I.
 
 common-objs-y += powerpc.o emulate.o
 obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o
-obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_64_exports.o
+obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_exports.o
 
 AFLAGS_booke_interrupts.o := -I$(obj)
 
@@ -43,8 +43,8 @@ kvm-book3s_64-objs := \
 	fpu.o \
 	book3s_paired_singles.o \
 	book3s.o \
-	book3s_64_emulate.o \
-	book3s_64_interrupts.o \
+	book3s_emulate.o \
+	book3s_interrupts.o \
 	book3s_64_mmu_host.o \
 	book3s_64_mmu.o \
 	book3s_32_mmu.o

diff --git a/trunk/arch/powerpc/kvm/book3s_64_emulate.c → trunk/arch/powerpc/kvm/book3s_emulate.c b/trunk/arch/powerpc/kvm/book3s_64_emulate.c → trunk/arch/powerpc/kvm/book3s_emulate.c
diff --git a/trunk/arch/powerpc/kvm/book3s_64_exports.c → trunk/arch/powerpc/kvm/book3s_exports.c b/trunk/arch/powerpc/kvm/book3s_64_exports.c → trunk/arch/powerpc/kvm/book3s_exports.c
diff --git a/...k/arch/powerpc/kvm/book3s_64_interrupts.S → trunk/arch/powerpc/kvm/book3s_interrupts.S b/...k/arch/powerpc/kvm/book3s_64_interrupts.S → trunk/arch/powerpc/kvm/book3s_interrupts.S
@@ -315,4 +315,3 @@ kvm_loop_lightweight:
 
 	/* Jump back into the beginning of this function */
 	b	kvm_start_lightweight
-
diff --git a/...k/arch/powerpc/kvm/book3s_64_rmhandlers.S → trunk/arch/powerpc/kvm/book3s_rmhandlers.S b/...k/arch/powerpc/kvm/book3s_64_rmhandlers.S → trunk/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -192,4 +192,3 @@ kvmppc_trampoline_enter:
 	.long kvmppc_handler_trampoline_enter - _stext
 
 #include "book3s_64_slb.S"
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -315,4 +315,3 @@ kvm_loop_lightweight:

		/* Jump back into the beginning of this function */
		b kvm_start_lightweight
Original file line number	Diff line number	Diff line change
Expand Up		@@ -192,4 +192,3 @@ kvmppc_trampoline_enter:
		.long kvmppc_handler_trampoline_enter - _stext

		#include "book3s_64_slb.S"