diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-03-09 19:08:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-11 12:42:08 +0100 |
| commit | 3c685791cedff04001160b9788e1809ad4d8695f (patch) | |
| tree | 76ac575b37e9620d40ccff702c337661a6a051b4 | |
| parent | e65cdb9c4adf34dce5398e4d77a4b3da4ef1e0dc (diff) | |
| download | linux-3c685791cedff04001160b9788e1809ad4d8695f.tar.gz linux-3c685791cedff04001160b9788e1809ad4d8695f.tar.bz2 linux-3c685791cedff04001160b9788e1809ad4d8695f.zip | |
ARM: fix co-processor register typo
commit 33970b031dc4653cc9dc80f2886976706c4c8ef1 upstream.
In the recent Spectre BHB patches, there was a typo that is only
exposed in certain configurations: mcr p15,0,XX,c7,r5,4 should have
been mcr p15,0,XX,c7,c5,4
Reported-by: kernel test robot <lkp@intel.com>
Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround")
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index b50cc0169d5c..aee73ef5b3dc 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -113,7 +113,7 @@ .endm .macro isb, args - mcr p15, 0, r0, c7, r5, 4 + mcr p15, 0, r0, c7, c5, 4 .endm #endif |