From 2191d657c9eaa4c444c33e014199ed9de1ac339d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 16 Apr 2010 00:11:32 +0200 Subject: [PATCH] KVM: PPC: Name generic 64-bit code generic We have quite some code that can be used by Book3S_32 and Book3S_64 alike, so let's call it "Book3S" instead of "Book3S_64", so we can later on use it from the 32 bit port too. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity --- arch/powerpc/include/asm/kvm_book3s.h | 2 +- .../include/asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} | 0 arch/powerpc/include/asm/paca.h | 2 +- arch/powerpc/kernel/head_64.S | 4 ++-- arch/powerpc/kvm/Makefile | 6 +++--- arch/powerpc/kvm/{book3s_64_emulate.c => book3s_emulate.c} | 0 arch/powerpc/kvm/{book3s_64_exports.c => book3s_exports.c} | 0 .../kvm/{book3s_64_interrupts.S => book3s_interrupts.S} | 1 - .../kvm/{book3s_64_rmhandlers.S => book3s_rmhandlers.S} | 1 - 9 files changed, 7 insertions(+), 9 deletions(-) rename arch/powerpc/include/asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} (100%) rename arch/powerpc/kvm/{book3s_64_emulate.c => book3s_emulate.c} (100%) rename arch/powerpc/kvm/{book3s_64_exports.c => book3s_exports.c} (100%) rename arch/powerpc/kvm/{book3s_64_interrupts.S => book3s_interrupts.S} (99%) rename arch/powerpc/kvm/{book3s_64_rmhandlers.S => book3s_rmhandlers.S} (99%) diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index ee7992189c6e..7670e2a12867 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -22,7 +22,7 @@ #include #include -#include +#include struct kvmppc_slb { u64 esid; diff --git a/arch/powerpc/include/asm/kvm_book3s_64_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h similarity index 100% rename from arch/powerpc/include/asm/kvm_book3s_64_asm.h rename to arch/powerpc/include/asm/kvm_book3s_asm.h diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index a011603d4079..dc3ccdf81996 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -23,7 +23,7 @@ #include #include #ifdef CONFIG_KVM_BOOK3S_64_HANDLER -#include +#include #endif register struct paca_struct *local_paca asm("r13"); diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index bed9a29ee383..844a44b64472 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -37,7 +37,7 @@ #include #include #include -#include +#include /* 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/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index eba721e39328..0a67310299a6 100644 --- a/arch/powerpc/kvm/Makefile +++ b/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/arch/powerpc/kvm/book3s_64_emulate.c b/arch/powerpc/kvm/book3s_emulate.c similarity index 100% rename from arch/powerpc/kvm/book3s_64_emulate.c rename to arch/powerpc/kvm/book3s_emulate.c diff --git a/arch/powerpc/kvm/book3s_64_exports.c b/arch/powerpc/kvm/book3s_exports.c similarity index 100% rename from arch/powerpc/kvm/book3s_64_exports.c rename to arch/powerpc/kvm/book3s_exports.c diff --git a/arch/powerpc/kvm/book3s_64_interrupts.S b/arch/powerpc/kvm/book3s_interrupts.S similarity index 99% rename from arch/powerpc/kvm/book3s_64_interrupts.S rename to arch/powerpc/kvm/book3s_interrupts.S index faca87610d65..570f87407691 100644 --- a/arch/powerpc/kvm/book3s_64_interrupts.S +++ b/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/arch/powerpc/kvm/book3s_64_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S similarity index 99% rename from arch/powerpc/kvm/book3s_64_rmhandlers.S rename to arch/powerpc/kvm/book3s_rmhandlers.S index bd08535fcdc8..d89e315615bc 100644 --- a/arch/powerpc/kvm/book3s_64_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_rmhandlers.S @@ -192,4 +192,3 @@ kvmppc_trampoline_enter: .long kvmppc_handler_trampoline_enter - _stext #include "book3s_64_slb.S" - -- 2.20.1