summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/entry_64.S
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2020-11-06 05:53:40 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2020-12-09 13:48:14 +0100
commite89a8ca94bf583f2577fe722483f0304b3390aa2 (patch)
tree68704f0dd295e79396af283b9a9777ade65ac1aa /arch/powerpc/kernel/entry_64.S
parentpowerpc/64s/iommu: Don't use atomic_ function on atomic64_t type (diff)
downloadlinux-e89a8ca94bf583f2577fe722483f0304b3390aa2.tar.xz
linux-e89a8ca94bf583f2577fe722483f0304b3390aa2.zip
powerpc/64s: Remove MSR[ISF] bit
No supported processor implements this mode. Setting the bit in MSR values can be a bit confusing (and would prevent the bit from ever being reused). Remove it. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20201106045340.1935841-1-npiggin@gmail.com
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
-rw-r--r--arch/powerpc/kernel/entry_64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index c9d59450fba0..aa1af139d947 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -969,7 +969,7 @@ _GLOBAL(enter_prom)
mtsrr1 r11
rfi
#else /* CONFIG_PPC_BOOK3E */
- LOAD_REG_IMMEDIATE(r12, MSR_SF | MSR_ISF | MSR_LE)
+ LOAD_REG_IMMEDIATE(r12, MSR_SF | MSR_LE)
andc r11,r11,r12
mtsrr1 r11
RFI_TO_KERNEL