diff -upN reference/arch/i386/kernel/irq.c current/arch/i386/kernel/irq.c
--- reference/arch/i386/kernel/irq.c	Wed Jun 16 10:59:28 2004
+++ current/arch/i386/kernel/irq.c	Wed Jun 16 15:53:11 2004
@@ -514,6 +514,8 @@ asmlinkage unsigned int do_IRQ(struct pt
 			/* build the stack frame on the IRQ stack */
 			isp = (u32*) ((char*)irqctx + sizeof(*irqctx));
 			irqctx->tinfo.task = curctx->tinfo.task;
+			irqctx->tinfo.real_stack = curctx->tinfo.real_stack;
+			irqctx->tinfo.virtual_stack = curctx->tinfo.virtual_stack;
 			irqctx->tinfo.previous_esp = current_stack_pointer();
 
 			*--isp = (u32) action;
@@ -1172,6 +1174,8 @@ asmlinkage void do_softirq(void)
 		curctx = current_thread_info();
 		irqctx = softirq_ctx[smp_processor_id()];
 		irqctx->tinfo.task = curctx->task;
+		irqctx->tinfo.real_stack = curctx->real_stack;
+		irqctx->tinfo.virtual_stack = curctx->virtual_stack;
 		irqctx->tinfo.previous_esp = current_stack_pointer();
 
 		/* build the stack frame on the softirq stack */