Commit a5d157e0 authored Jun 25, 2006 by Björn Steinbrink Committed by Linus Torvalds Jun 25, 2006

[PATCH] i386: Fix softirq accounting with 4K stacks



Copy the softirq bits in preempt_count from the current context into the
hardirq context when using 4K stacks to make the softirq_count macro work
correctly and thereby fix softirq cpu time accounting.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 1d77062b

arch/i386/kernel/irq.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,14 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
		irqctx->tinfo.task = curctx->tinfo.task;
		irqctx->tinfo.previous_esp = current_stack_pointer;

		/*
		* Copy the softirq bits in preempt_count so that the
		* softirq checks work in the hardirq context.
		*/
		irqctx->tinfo.preempt_count =
		irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK \|
		curctx->tinfo.preempt_count & SOFTIRQ_MASK;

		asm volatile(
		" xchgl %%ebx,%%esp \n"
		" call __do_IRQ \n"