diff options
| author | Alexander Graf <agraf@suse.de> | 2010-04-15 18:11:32 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 05:18:14 -0400 |
| commit | 2191d657c9eaa4c444c33e014199ed9de1ac339d (patch) | |
| tree | 091ac64b7ed2962ad9482660a58efa3532d4dcb7 /arch/powerpc/kvm | |
| parent | 77a1a715707d0f60ce0cfbe44070527a0a561f01 (diff) | |
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 <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm')
| -rw-r--r-- | arch/powerpc/kvm/Makefile | 6 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_emulate.c (renamed from arch/powerpc/kvm/book3s_64_emulate.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_exports.c (renamed from arch/powerpc/kvm/book3s_64_exports.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_interrupts.S (renamed from arch/powerpc/kvm/book3s_64_interrupts.S) | 1 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_rmhandlers.S (renamed from arch/powerpc/kvm/book3s_64_rmhandlers.S) | 1 |
5 files changed, 3 insertions, 5 deletions
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. | |||
| 14 | 14 | ||
| 15 | common-objs-y += powerpc.o emulate.o | 15 | common-objs-y += powerpc.o emulate.o |
| 16 | obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o | 16 | obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o |
| 17 | obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_64_exports.o | 17 | obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_exports.o |
| 18 | 18 | ||
| 19 | AFLAGS_booke_interrupts.o := -I$(obj) | 19 | AFLAGS_booke_interrupts.o := -I$(obj) |
| 20 | 20 | ||
| @@ -43,8 +43,8 @@ kvm-book3s_64-objs := \ | |||
| 43 | fpu.o \ | 43 | fpu.o \ |
| 44 | book3s_paired_singles.o \ | 44 | book3s_paired_singles.o \ |
| 45 | book3s.o \ | 45 | book3s.o \ |
| 46 | book3s_64_emulate.o \ | 46 | book3s_emulate.o \ |
| 47 | book3s_64_interrupts.o \ | 47 | book3s_interrupts.o \ |
| 48 | book3s_64_mmu_host.o \ | 48 | book3s_64_mmu_host.o \ |
| 49 | book3s_64_mmu.o \ | 49 | book3s_64_mmu.o \ |
| 50 | book3s_32_mmu.o | 50 | book3s_32_mmu.o |
diff --git a/arch/powerpc/kvm/book3s_64_emulate.c b/arch/powerpc/kvm/book3s_emulate.c index 8f50776a9a1d..8f50776a9a1d 100644 --- a/arch/powerpc/kvm/book3s_64_emulate.c +++ b/arch/powerpc/kvm/book3s_emulate.c | |||
diff --git a/arch/powerpc/kvm/book3s_64_exports.c b/arch/powerpc/kvm/book3s_exports.c index 1dd5a1ddfd0d..1dd5a1ddfd0d 100644 --- a/arch/powerpc/kvm/book3s_64_exports.c +++ b/arch/powerpc/kvm/book3s_exports.c | |||
diff --git a/arch/powerpc/kvm/book3s_64_interrupts.S b/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: | |||
| 315 | 315 | ||
| 316 | /* Jump back into the beginning of this function */ | 316 | /* Jump back into the beginning of this function */ |
| 317 | b kvm_start_lightweight | 317 | b kvm_start_lightweight |
| 318 | |||
diff --git a/arch/powerpc/kvm/book3s_64_rmhandlers.S b/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: | |||
| 192 | .long kvmppc_handler_trampoline_enter - _stext | 192 | .long kvmppc_handler_trampoline_enter - _stext |
| 193 | 193 | ||
| 194 | #include "book3s_64_slb.S" | 194 | #include "book3s_64_slb.S" |
| 195 | |||