Merge tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / parisc / kernel / real2.S

diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S
index 1db58e546230be27515c649a9a4ae2fe57c061fe..cc9963421a19377f3faea08bf2686611a0856816 100644 (file)
--- a/arch/parisc/kernel/real2.S
+++ b/arch/parisc/kernel/real2.S
@@ -162,6 +162,7 @@ ENDPROC_CFI(restore_control_regs)
        .text
        .align 128
 ENTRY_CFI(rfi_virt2real)
+#if !defined(BOOTLOADER)
        /* switch to real mode... */
        rsm             PSW_SM_I,%r0
        load32          PA(rfi_v2r_1), %r1
@@ -191,6 +192,7 @@ ENTRY_CFI(rfi_virt2real)
        nop
 rfi_v2r_1:
        tophys_r1 %r2
+#endif /* defined(BOOTLOADER) */
        bv      0(%r2)
        nop
 ENDPROC_CFI(rfi_virt2real)
@@ -198,6 +200,7 @@ ENDPROC_CFI(rfi_virt2real)
        .text
        .align 128
 ENTRY_CFI(rfi_real2virt)
+#if !defined(BOOTLOADER)
        rsm             PSW_SM_I,%r0
        load32          (rfi_r2v_1), %r1
        nop
@@ -226,6 +229,7 @@ ENTRY_CFI(rfi_real2virt)
        nop
 rfi_r2v_1:
        tovirt_r1 %r2
+#endif /* defined(BOOTLOADER) */
        bv      0(%r2)
        nop
 ENDPROC_CFI(rfi_real2virt)