aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2010-07-29 09:04:21 -0400
committerAvi Kivity <avi@redhat.com>2010-10-24 04:50:59 -0400
commit2b05d71fefc3b83e686bead355c6d35e440c4261 (patch)
tree5bb5ec2e1a6452d162f1aee72f296184686ce5d6 /arch/powerpc/kvm
parent0e677903878ef90e09a45507255c0b1e36166064 (diff)
KVM: PPC: Make long relocations be ulong
On Book3S KVM we directly expose some asm pointers to C code as variables. These need to be relocated and thus break on relocatable kernels. To make sure we can at least build, let's mark them as long instead of u32 where 64bit relocations don't work. This fixes the following build error: WARNING: 2 bad relocations^M > c000000000008590 R_PPC64_ADDR32 .text+0x4000000000008460^M > c000000000008594 R_PPC64_ADDR32 .text+0x4000000000008598^M Please keep in mind that actually using KVM on a relocated kernel might still break. This only fixes the compile problem. Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com> 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/book3s_rmhandlers.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index 229d3d662af9..2b9c9088d00e 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -252,10 +252,10 @@ define_load_up(vsx)
252 252
253.global kvmppc_trampoline_lowmem 253.global kvmppc_trampoline_lowmem
254kvmppc_trampoline_lowmem: 254kvmppc_trampoline_lowmem:
255 .long kvmppc_handler_lowmem_trampoline - CONFIG_KERNEL_START 255 PPC_LONG kvmppc_handler_lowmem_trampoline - CONFIG_KERNEL_START
256 256
257.global kvmppc_trampoline_enter 257.global kvmppc_trampoline_enter
258kvmppc_trampoline_enter: 258kvmppc_trampoline_enter:
259 .long kvmppc_handler_trampoline_enter - CONFIG_KERNEL_START 259 PPC_LONG kvmppc_handler_trampoline_enter - CONFIG_KERNEL_START
260 260
261#include "book3s_segment.S" 261#include "book3s_segment.S"