Merge remote-tracking branch 'anton/abiv2' into next

This series adds support for building the powerpc 64-bit
LE kernel using the new ABI v2. We already supported
running ABI v2 userspace programs but this adds support
for building the kernel itself using the new ABI.

2 files changed, 18 insertions, 18 deletions

diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S
index e18e3cfc32de..8c86422a1e37 100644
--- a/arch/powerpc/kvm/book3s_hv_interrupts.S
+++ b/arch/powerpc/kvm/book3s_hv_interrupts.S
@@ -171,7 +171,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201)
 #endif /* CONFIG_SMP */
 
         /* Jump to partition switch code */
-        bl      .kvmppc_hv_entry_trampoline
+        bl      kvmppc_hv_entry_trampoline
         nop
 
 /*
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index b031f932c0cc..9f0ad718e476 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1658,7 +1658,7 @@ kvmppc_hdsi:
         /* Search the hash table. */
         mr      r3, r9                  /* vcpu pointer */
         li      r7, 1                   /* data fault */
-        bl      .kvmppc_hpte_hv_fault
+        bl      kvmppc_hpte_hv_fault
         ld      r9, HSTATE_KVM_VCPU(r13)
         ld      r10, VCPU_PC(r9)
         ld      r11, VCPU_MSR(r9)
@@ -1732,7 +1732,7 @@ kvmppc_hisi:
         mr      r4, r10
         mr      r6, r11
         li      r7, 0                   /* instruction fault */
-        bl      .kvmppc_hpte_hv_fault
+        bl      kvmppc_hpte_hv_fault
         ld      r9, HSTATE_KVM_VCPU(r13)
         ld      r10, VCPU_PC(r9)
         ld      r11, VCPU_MSR(r9)
@@ -1806,16 +1806,16 @@ hcall_real_fallback:
         .globl  hcall_real_table
 hcall_real_table:
         .long   0               /* 0 - unused */
-        .long   .kvmppc_h_remove - hcall_real_table
-        .long   .kvmppc_h_enter - hcall_real_table
-        .long   .kvmppc_h_read - hcall_real_table
+        .long   DOTSYM(kvmppc_h_remove) - hcall_real_table
+        .long   DOTSYM(kvmppc_h_enter) - hcall_real_table
+        .long   DOTSYM(kvmppc_h_read) - hcall_real_table
         .long   0               /* 0x10 - H_CLEAR_MOD */
         .long   0               /* 0x14 - H_CLEAR_REF */
-        .long   .kvmppc_h_protect - hcall_real_table
-        .long   .kvmppc_h_get_tce - hcall_real_table
-        .long   .kvmppc_h_put_tce - hcall_real_table
+        .long   DOTSYM(kvmppc_h_protect) - hcall_real_table
+        .long   DOTSYM(kvmppc_h_get_tce) - hcall_real_table
+        .long   DOTSYM(kvmppc_h_put_tce) - hcall_real_table
         .long   0               /* 0x24 - H_SET_SPRG0 */
-        .long   .kvmppc_h_set_dabr - hcall_real_table
+        .long   DOTSYM(kvmppc_h_set_dabr) - hcall_real_table
         .long   0               /* 0x2c */
         .long   0               /* 0x30 */
         .long   0               /* 0x34 */
@@ -1831,11 +1831,11 @@ hcall_real_table:
         .long   0               /* 0x5c */
         .long   0               /* 0x60 */
 #ifdef CONFIG_KVM_XICS
-        .long   .kvmppc_rm_h_eoi - hcall_real_table
-        .long   .kvmppc_rm_h_cppr - hcall_real_table
-        .long   .kvmppc_rm_h_ipi - hcall_real_table
+        .long   DOTSYM(kvmppc_rm_h_eoi) - hcall_real_table
+        .long   DOTSYM(kvmppc_rm_h_cppr) - hcall_real_table
+        .long   DOTSYM(kvmppc_rm_h_ipi) - hcall_real_table
         .long   0               /* 0x70 - H_IPOLL */
-        .long   .kvmppc_rm_h_xirr - hcall_real_table
+        .long   DOTSYM(kvmppc_rm_h_xirr) - hcall_real_table
 #else
         .long   0               /* 0x64 - H_EOI */
         .long   0               /* 0x68 - H_CPPR */
@@ -1869,7 +1869,7 @@ hcall_real_table:
         .long   0               /* 0xd4 */
         .long   0               /* 0xd8 */
         .long   0               /* 0xdc */
-        .long   .kvmppc_h_cede - hcall_real_table
+        .long   DOTSYM(kvmppc_h_cede) - hcall_real_table
         .long   0               /* 0xe4 */
         .long   0               /* 0xe8 */
         .long   0               /* 0xec */
@@ -1886,11 +1886,11 @@ hcall_real_table:
         .long   0               /* 0x118 */
         .long   0               /* 0x11c */
         .long   0               /* 0x120 */
-        .long   .kvmppc_h_bulk_remove - hcall_real_table
+        .long   DOTSYM(kvmppc_h_bulk_remove) - hcall_real_table
         .long   0               /* 0x128 */
         .long   0               /* 0x12c */
         .long   0               /* 0x130 */
-        .long   .kvmppc_h_set_xdabr - hcall_real_table
+        .long   DOTSYM(kvmppc_h_set_xdabr) - hcall_real_table
 hcall_real_table_end:
 
 ignore_hdec:
@@ -2115,7 +2115,7 @@ kvm_cede_exit:
         /* Try to handle a machine check in real mode */
 machine_check_realmode:
         mr      r3, r9          /* get vcpu pointer */
-        bl      .kvmppc_realmode_machine_check
+        bl      kvmppc_realmode_machine_check
         nop
         cmpdi   r3, 0           /* continue exiting from guest? */
         ld      r9, HSTATE_KVM_VCPU(r13)