diff options
| author | Christophe Leroy | 2019-01-12 10:55:50 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2019-02-23 12:31:40 +0100 |
| commit | c911d2e128e8ab7e789a5488dcb63ae9fe130aca (patch) | |
| tree | aaefcd2c47d20d12d908d868def9d79433686d2e /arch/powerpc/kernel/exceptions-64s.S | |
| parent | powerpc/32: Remove CURRENT_THREAD_INFO and rename TI_CPU (diff) | |
| download | kernel-qcow2-linux-c911d2e128e8ab7e789a5488dcb63ae9fe130aca.tar.gz kernel-qcow2-linux-c911d2e128e8ab7e789a5488dcb63ae9fe130aca.tar.xz kernel-qcow2-linux-c911d2e128e8ab7e789a5488dcb63ae9fe130aca.zip | |
powerpc/64: Replace CURRENT_THREAD_INFO with PACA_THREAD_INFO
Now that current_thread_info is located at the beginning of 'current'
task struct, CURRENT_THREAD_INFO macro is not really needed any more.
This patch replaces it by loads of the value at PACA_THREAD_INFO(r13).
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
[mpe: Add PACA_THREAD_INFO rather than using PACACURRENT]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 9e253ce27e08..b179b8b5d3f0 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1629,7 +1629,7 @@ do_hash_page: ori r0,r0,DSISR_BAD_FAULT_64S@l and. r0,r4,r0 /* weird error? */ bne- handle_page_fault /* if not, try to insert a HPTE */ - CURRENT_THREAD_INFO(r11, r1) + ld r11, PACA_THREAD_INFO(r13) lwz r0,TI_PREEMPT(r11) /* If we're in an "NMI" */ andis. r0,r0,NMI_MASK@h /* (i.e. an irq when soft-disabled) */ bne 77f /* then don't call hash_page now */ |