diff options
| author |  Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
| 2023-08-14 12:18:06 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
| 2023-08-14 12:18:06 +0100 |
| commit | f493fedcc3016e46ecbf7ab9490ba4762723efab (patch) | |
| tree | d1e8d745b81f1034700679e4bf26a9cdc2f00997 /arch/arm/mm | |
| parent | ARM: 9318/1: locomo: move kernel-doc to prevent warnings (diff) | |
| parent | Merge tag 'arm-vfp-refactor-for-rmk' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-f493fedcc3016e46ecbf7ab9490ba4762723efab.tar.gz linux-f493fedcc3016e46ecbf7ab9490ba4762723efab.tar.bz2 linux-f493fedcc3016e46ecbf7ab9490ba4762723efab.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-feroceon.S | 4 |
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 /* |