diff --git a/include/asm-i386/irq_regs.h b/include/asm-i386/irq_regs.h
index 3dd9c0b702704abfe23c0b8085f0fd84dcd3f5d5..a1b3f7f594a26e87d0dcc9902bd45bd4af1eaaf7 100644
--- a/include/asm-i386/irq_regs.h
+++ b/include/asm-i386/irq_regs.h
@@ -1 +1,27 @@
-#include <asm-generic/irq_regs.h>
+/*
+ * Per-cpu current frame pointer - the location of the last exception frame on
+ * the stack, stored in the PDA.
+ *
+ * Jeremy Fitzhardinge <jeremy@goop.org>
+ */
+#ifndef _ASM_I386_IRQ_REGS_H
+#define _ASM_I386_IRQ_REGS_H
+
+#include <asm/pda.h>
+
+static inline struct pt_regs *get_irq_regs(void)
+{
+	return read_pda(irq_regs);
+}
+
+static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)
+{
+	struct pt_regs *old_regs;
+
+	old_regs = read_pda(irq_regs);
+	write_pda(irq_regs, new_regs);
+
+	return old_regs;
+}
+
+#endif /* _ASM_I386_IRQ_REGS_H */
diff --git a/include/asm-i386/pda.h b/include/asm-i386/pda.h
index 08a35c478af231c71022c17528010335631a6f34..2ba2736aa109833ef0cc4ae4819cbb4065ccbe95 100644
--- a/include/asm-i386/pda.h
+++ b/include/asm-i386/pda.h
@@ -15,6 +15,7 @@ struct i386_pda
 
 	int cpu_number;
 	struct task_struct *pcurrent;	/* current process */
+	struct pt_regs *irq_regs;
 };
 
 extern struct i386_pda *_cpu_pda[];