Commit c4ec1f03 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64: Remove unused paca->soft_enabled 



In commit 4e26bc4a ("powerpc/64: Rename soft_enabled to
irq_soft_mask") we renamed paca->soft_enabled. But then in commit
8e0b634b ("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: 8e0b634b ("powerpc/64s: Do not allocate lppaca if we are not virtualized")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b2d7ecbe

arch/powerpc/include/asm/paca.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,6 @@ struct paca_struct { 
	u64 saved_msr;			/* MSR saved here by enter_rtas */

	u64 saved_msr;			/* MSR saved here by enter_rtas */

	u16 trap_save;			/* Used when bad stack is encountered */

	u16 trap_save;			/* Used when bad stack is encountered */

	u8 irq_soft_mask;		/* mask for irq soft masking */

	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 irq_happened;		/* irq happened while soft-disabled */

	u8 io_sync;			/* writel() needs spin_unlock sync */

	u8 io_sync;			/* writel() needs spin_unlock sync */

	u8 irq_work_pending;		/* IRQ_WORK interrupt while soft-disable */

	u8 irq_work_pending;		/* IRQ_WORK interrupt while soft-disable */