summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2023-08-14 14:18:06 +0300
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2023-08-14 14:18:06 +0300
commitf493fedcc3016e46ecbf7ab9490ba4762723efab (patch)
treed1e8d745b81f1034700679e4bf26a9cdc2f00997 /arch/arm/mm
parentb0a6da43a510fdfff23fcda12f90fba37cab1c05 (diff)
parent53ae158f6ddc14df5c44d62c06e33fdb66de1196 (diff)
downloadlinux-f493fedcc3016e46ecbf7ab9490ba4762723efab.tar.xz
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-feroceon.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 61ce82aca6f0..072ff9b451f8 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -56,6 +56,10 @@ ENTRY(cpu_feroceon_proc_init)
movne r2, r2, lsr #2 @ turned into # of sets
sub r2, r2, #(1 << 5)
stmia r1, {r2, r3}
+#ifdef CONFIG_VFP
+ mov r1, #1 @ disable quirky VFP
+ str_l r1, VFP_arch_feroceon, r2
+#endif
ret lr
/*