powerpc/64: Rename soft_enabled to irq_soft_mask
Rename the paca->soft_enabled to paca->irq_soft_mask as it is no longer used as a flag for interrupt state, but a mask. Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:

committed by
Michael Ellerman

parent
01417c6cc7
commit
4e26bc4a4e
@@ -47,14 +47,14 @@
|
||||
* be clobbered.
|
||||
*/
|
||||
#define RECONCILE_IRQ_STATE(__rA, __rB) \
|
||||
lbz __rA,PACASOFTIRQEN(r13); \
|
||||
lbz __rA,PACAIRQSOFTMASK(r13); \
|
||||
lbz __rB,PACAIRQHAPPENED(r13); \
|
||||
andi. __rA,__rA,IRQS_DISABLED;\
|
||||
li __rA,IRQS_DISABLED; \
|
||||
andi. __rA,__rA,IRQS_DISABLED; \
|
||||
li __rA,IRQS_DISABLED; \
|
||||
ori __rB,__rB,PACA_IRQ_HARD_DIS; \
|
||||
stb __rB,PACAIRQHAPPENED(r13); \
|
||||
bne 44f; \
|
||||
stb __rA,PACASOFTIRQEN(r13); \
|
||||
stb __rA,PACAIRQSOFTMASK(r13); \
|
||||
TRACE_DISABLE_INTS; \
|
||||
44:
|
||||
|
||||
@@ -64,9 +64,9 @@
|
||||
|
||||
#define RECONCILE_IRQ_STATE(__rA, __rB) \
|
||||
lbz __rA,PACAIRQHAPPENED(r13); \
|
||||
li __rB,IRQS_DISABLED; \
|
||||
li __rB,IRQS_DISABLED; \
|
||||
ori __rA,__rA,PACA_IRQ_HARD_DIS; \
|
||||
stb __rB,PACASOFTIRQEN(r13); \
|
||||
stb __rB,PACAIRQSOFTMASK(r13); \
|
||||
stb __rA,PACAIRQHAPPENED(r13)
|
||||
#endif
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user