git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
kernel
/
irq.c
diff --git
a/arch/parisc/kernel/irq.c
b/arch/parisc/kernel/irq.c
index 5ebb1771b4ab6ddde12a5d5ad6dc361dc8609d6c..fbb882cb8dbb5f9316af05f7c9f45faf90701cec 100644
(file)
--- a/
arch/parisc/kernel/irq.c
+++ b/
arch/parisc/kernel/irq.c
@@
-480,10
+480,12
@@
static void execute_on_irq_stack(void *func, unsigned long param1)
*irq_stack_in_use = 1;
}
+#ifndef CONFIG_PREEMPT_RT
void do_softirq_own_stack(void)
{
execute_on_irq_stack(__do_softirq, 0);
}
+#endif
#endif /* CONFIG_IRQSTACKS */
/* ONLY called from entry.S:intr_extint() */