diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2018-02-21 05:08:26 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-01 00:47:49 +1100 |
commit | 15a3204d24a3c01b116fb7c0692b7c670cac631d (patch) | |
tree | c5f46ce738a1044d00b647f0d967c336cc303c62 /arch/powerpc/kernel/entry_64.S | |
parent | d50614fa45760f5ec1772509625e1bf4abe5d052 (diff) | |
download | op-kernel-dev-15a3204d24a3c01b116fb7c0692b7c670cac631d.zip op-kernel-dev-15a3204d24a3c01b116fb7c0692b7c670cac631d.tar.gz |
powerpc/64s: Set assembler machine type to POWER4
Rather than override the machine type in .S code (which can hide wrong
or ambiguous code generation for the target), set the type to power4
for all assembly.
This also means we need to be careful not to build power4-only code
when we're not building for Book3S, such as the "power7" versions of
copyuser/page/memcpy.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
[mpe: Fix Book3E build, don't build the "power7" variants for non-Book3S]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/entry_64.S')
-rw-r--r-- | arch/powerpc/kernel/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2cb5109..5169560 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -545,7 +545,7 @@ _GLOBAL(_switch) /* Cancel all explict user streams as they will have no use after context * switch and will stop the HW from creating streams itself */ - DCBT_STOP_ALL_STREAM_IDS(r6) + DCBT_BOOK3S_STOP_ALL_STREAM_IDS(r6) #endif addi r6,r4,-THREAD /* Convert THREAD to 'current' */ |