diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-02 07:53:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-02 07:53:01 +0200 |
| commit | 0d119fb57614fe947aa9048f61d680bbede64170 (patch) | |
| tree | b5683188f27655f5c1caac2978facebb61e7bd58 /kernel | |
| parent | f927318840745095cc7003f1564ca4b87655745d (diff) | |
| parent | ded797547548a5b8e7b92383a41e4c0e6b0ecb7f (diff) | |
| download | linux-0d119fb57614fe947aa9048f61d680bbede64170.tar.bz2 | |
Merge branch 'irq/urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into irq/urgent
Pull a hardirq-nesting fix from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/softirq.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 53cc09ceb0b8..d7d498d8cc4f 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -328,10 +328,19 @@ void irq_enter(void) static inline void invoke_softirq(void) { - if (!force_irqthreads) - __do_softirq(); - else + if (!force_irqthreads) { + /* + * We can safely execute softirq on the current stack if + * it is the irq stack, because it should be near empty + * at this stage. But we have no way to know if the arch + * calls irq_exit() on the irq stack. So call softirq + * in its own stack to prevent from any overrun on top + * of a potentially deep task stack. + */ + do_softirq(); + } else { wakeup_softirqd(); + } } static inline void tick_irq_exit(void) |