Commit 2191d657 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

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: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 77a1a715

arch/powerpc/include/asm/kvm_book3s.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/include/asm/paca.h

+1 −1
Original line number Diff line number Diff line
@@ -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");

arch/powerpc/kernel/head_64.S

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/powerpc/kvm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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