[tip:,x86/entry] um: Enforce the usage of asm-generic/softirq_stack.h
diff mbox series

Message ID 161346807864.20312.12484247851663762729.tip-bot2@tip-bot2
State Accepted
Commit 3aac798a917be3b8f2f647b834bb06bf2f8df4f1
Headers show
Series
  • [tip:,x86/entry] um: Enforce the usage of asm-generic/softirq_stack.h
Related show

Commit Message

tip-bot2 for Wei Yongjun Feb. 16, 2021, 9:34 a.m. UTC
The following commit has been merged into the x86/entry branch of tip:

Commit-ID:     3aac798a917be3b8f2f647b834bb06bf2f8df4f1
Gitweb:        https://git.kernel.org/tip/3aac798a917be3b8f2f647b834bb06bf2f8df4f1
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Tue, 16 Feb 2021 10:23:14 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 16 Feb 2021 10:23:14 +01:00

um: Enforce the usage of asm-generic/softirq_stack.h

The recent rework of the X86 irq stack switching mechanism broke UM as UM
pulls in the X86 specific variant of softirq_stack.h.

Enforce the usage of the asm-generic variant.

Fixes: 72f40a2823d6 ("x86/softirq/64: Inline do_softirq_own_stack()")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Weinberger <richard@nod.at>
---
 arch/um/include/asm/Kbuild | 1 +
 1 file changed, 1 insertion(+)

Patch
diff mbox series

diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 1c63b26..18f8645 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -21,6 +21,7 @@  generic-y += param.h
 generic-y += pci.h
 generic-y += percpu.h
 generic-y += preempt.h
+generic-y += softirq_stack.h
 generic-y += switch_to.h
 generic-y += topology.h
 generic-y += trace_clock.h