---

yaml --- r: 356887 b: refs/heads/master c: 3f0c3d0 h: refs/heads/master i: 356885: ae33fed 356883: 460b551 356879: a44c9b0 v: v3
git-mirror · Jan 27, 2013 · a8f6229 · a8f6229
1 parent 913e9db
commit a8f6229
Show file tree

Hide file tree

Showing 7 changed files with 645 additions and 745 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e3e208935e95ad62bd1b1bc4408c23a9ae3ada
+refs/heads/master: 3f0c3d0bb2bcc4b88b22452a7cf0073ee9a0f1e6
diff --git a/trunk/arch/powerpc/kvm/Makefile b/trunk/arch/powerpc/kvm/Makefile
@@ -10,8 +10,7 @@ common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o \
 						eventfd.o)
 
 CFLAGS_44x_tlb.o  := -I.
-CFLAGS_e500_mmu.o := -I.
-CFLAGS_e500_mmu_host.o := -I.
+CFLAGS_e500_tlb.o := -I.
 CFLAGS_emulate.o  := -I.
 
 common-objs-y += powerpc.o emulate.o
@@ -36,8 +35,7 @@ kvm-e500-objs := \
 	booke_emulate.o \
 	booke_interrupts.o \
 	e500.o \
-	e500_mmu.o \
-	e500_mmu_host.o \
+	e500_tlb.o \
 	e500_emulate.o
 kvm-objs-$(CONFIG_KVM_E500V2) := $(kvm-e500-objs)
 
@@ -47,8 +45,7 @@ kvm-e500mc-objs := \
 	booke_emulate.o \
 	bookehv_interrupts.o \
 	e500mc.o \
-	e500_mmu.o \
-	e500_mmu_host.o \
+	e500_tlb.o \
 	e500_emulate.o
 kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs)
 

diff --git a/trunk/arch/powerpc/kvm/e500.h b/trunk/arch/powerpc/kvm/e500.h
@@ -28,7 +28,6 @@
 
 #define E500_TLB_VALID 1
 #define E500_TLB_BITMAP 2
-#define E500_TLB_TLB0		(1 << 2)
 
 struct tlbe_ref {
 	pfn_t pfn;