Merge tag 'fscache-next-20210829' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / arm / vfp / vfphw.S

diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index 4fcff9f..6f7926c 100644 (file)
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -23,7 +23,7 @@
 #ifdef DEBUG
        stmfd   sp!, {r0-r3, ip, lr}
        ldr     r0, =1f
-       bl      printk
+       bl      _printk
        ldmfd   sp!, {r0-r3, ip, lr}
 
        .pushsection .rodata, "a"
@@ -38,7 +38,7 @@
        stmfd   sp!, {r0-r3, ip, lr}
        mov     r1, \arg
        ldr     r0, =1f
-       bl      printk
+       bl      _printk
        ldmfd   sp!, {r0-r3, ip, lr}
 
        .pushsection .rodata, "a"
@@ -55,7 +55,7 @@
        mov     r2, \arg2
        mov     r1, \arg1
        ldr     r0, =1f
-       bl      printk
+       bl      _printk
        ldmfd   sp!, {r0-r3, ip, lr}
 
        .pushsection .rodata, "a"
@@ -79,11 +79,6 @@ ENTRY(vfp_support_entry)
        DBGSTR3 "instr %08x pc %08x state %p", r0, r2, r10
 
        .fpu    vfpv2
-       ldr     r3, [sp, #S_PSR]        @ Neither lazy restore nor FP exceptions
-       and     r3, r3, #MODE_MASK      @ are supported in kernel mode
-       teq     r3, #USR_MODE
-       bne     vfp_kmode_exception     @ Returns through lr
-
        VFPFMRX r1, FPEXC               @ Is the VFP enabled?
        DBGSTR1 "fpexc %08x", r1
        tst     r1, #FPEXC_EN