tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/ppc64: Rename SOFT_DISABLE_INTS with RECONCILE_IRQ_STATE

The SOFT_DISABLE_INTS seems an odd name for something that updates the
software state to be consistent with interrupts being hard disabled, so
rename SOFT_DISABLE_INTS with RECONCILE_IRQ_STATE to avoid this confusion.

Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Tiejun Chen and committed by
Benjamin Herrenschmidt de021bb7 7033b64b

+9 -8
+1 -1
arch/powerpc/include/asm/exception-64s.h
··· 479 479 */ 480 480 481 481 /* Exception addition: Hard disable interrupts */ 482 - #define DISABLE_INTS SOFT_DISABLE_INTS(r10,r11) 482 + #define DISABLE_INTS RECONCILE_IRQ_STATE(r10,r11) 483 483 484 484 #define ADD_NVGPRS \ 485 485 bl .save_nvgprs
+4 -3
arch/powerpc/include/asm/irqflags.h
··· 40 40 #define TRACE_DISABLE_INTS TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_off) 41 41 42 42 /* 43 - * This is used by assembly code to soft-disable interrupts 43 + * This is used by assembly code to soft-disable interrupts first and 44 + * reconcile irq state. 44 45 */ 45 - #define SOFT_DISABLE_INTS(__rA, __rB) \ 46 + #define RECONCILE_IRQ_STATE(__rA, __rB) \ 46 47 lbz __rA,PACASOFTIRQEN(r13); \ 47 48 lbz __rB,PACAIRQHAPPENED(r13); \ 48 49 cmpwi cr0,__rA,0; \ ··· 59 58 #define TRACE_ENABLE_INTS 60 59 #define TRACE_DISABLE_INTS 61 60 62 - #define SOFT_DISABLE_INTS(__rA, __rB) \ 61 + #define RECONCILE_IRQ_STATE(__rA, __rB) \ 63 62 lbz __rA,PACAIRQHAPPENED(r13); \ 64 63 li __rB,0; \ 65 64 ori __rA,__rA,PACA_IRQ_HARD_DIS; \
+2 -2
arch/powerpc/kernel/entry_64.S
··· 721 721 722 722 /* 723 723 * Here we are preempting the current task. We want to make 724 - * sure we are soft-disabled first 724 + * sure we are soft-disabled first and reconcile irq state. 725 725 */ 726 - SOFT_DISABLE_INTS(r3,r4) 726 + RECONCILE_IRQ_STATE(r3,r4) 727 727 1: bl .preempt_schedule_irq 728 728 729 729 /* Re-test flags and eventually loop */
+2 -2
arch/powerpc/kernel/exceptions-64e.S
··· 198 198 /* This second version is meant for exceptions that don't immediately 199 199 * hard-enable. We set a bit in paca->irq_happened to ensure that 200 200 * a subsequent call to arch_local_irq_restore() will properly 201 - * hard-enable and avoid the fast-path 201 + * hard-enable and avoid the fast-path, and then reconcile irq state. 202 202 */ 203 - #define INTS_DISABLE SOFT_DISABLE_INTS(r3,r4) 203 + #define INTS_DISABLE RECONCILE_IRQ_STATE(r3,r4) 204 204 205 205 /* This is called by exceptions that used INTS_KEEP (that did not touch 206 206 * irq indicators in the PACA). This will restore MSR:EE to it's previous