All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] powerpc/64: Remove unused paca->soft_enabled
@ 2018-05-02  6:57 Michael Ellerman
  2018-05-09 14:59 ` Michael Ellerman
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Ellerman @ 2018-05-02  6:57 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: npiggin, maddy

In commit 4e26bc4a4ed6 ("powerpc/64: Rename soft_enabled to
irq_soft_mask") we renamed paca->soft_enabled. But then in commit
8e0b634b1327 ("powerpc/64s: Do not allocate lppaca if we are not
virtualized") we added it back. Oops. This happened because the two
patches were in flight at the same time and rebased vs each other
multiple times, and we missed it in review.

Fixes: 8e0b634b1327 ("powerpc/64s: Do not allocate lppaca if we are not virtualized")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/include/asm/paca.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 433dcdbf9da5..e7814d948c7a 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -165,7 +165,6 @@ struct paca_struct {
 	u64 saved_msr;			/* MSR saved here by enter_rtas */
 	u16 trap_save;			/* Used when bad stack is encountered */
 	u8 irq_soft_mask;		/* mask for irq soft masking */
-	u8 soft_enabled;		/* irq soft-enable flag */
 	u8 irq_happened;		/* irq happened while soft-disabled */
 	u8 io_sync;			/* writel() needs spin_unlock sync */
 	u8 irq_work_pending;		/* IRQ_WORK interrupt while soft-disable */
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: powerpc/64: Remove unused paca->soft_enabled
  2018-05-02  6:57 [PATCH] powerpc/64: Remove unused paca->soft_enabled Michael Ellerman
@ 2018-05-09 14:59 ` Michael Ellerman
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2018-05-09 14:59 UTC (permalink / raw)
  To: Michael Ellerman, linuxppc-dev; +Cc: maddy, npiggin

On Wed, 2018-05-02 at 06:57:54 UTC, Michael Ellerman wrote:
> In commit 4e26bc4a4ed6 ("powerpc/64: Rename soft_enabled to
> irq_soft_mask") we renamed paca->soft_enabled. But then in commit
> 8e0b634b1327 ("powerpc/64s: Do not allocate lppaca if we are not
> virtualized") we added it back. Oops. This happened because the two
> patches were in flight at the same time and rebased vs each other
> multiple times, and we missed it in review.
> 
> Fixes: 8e0b634b1327 ("powerpc/64s: Do not allocate lppaca if we are not virtualized")
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Applied to powerpc fixes.

https://git.kernel.org/powerpc/c/c4ec1f0353b342473b93637fd0c3fb

cheers

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-05-09 14:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-02  6:57 [PATCH] powerpc/64: Remove unused paca->soft_enabled Michael Ellerman
2018-05-09 14:59 ` Michael Ellerman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.