summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/irq_regs.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-01-21 11:26:06 +0300
committerTejun Heo <tj@kernel.org>2009-01-21 11:26:06 +0300
commitd650a5148593b65a3c3f9a344f46b91b7dfe7713 (patch)
tree82f95863cf34977065a78dd2521d78208fa83336 /arch/x86/include/asm/irq_regs.h
parent6826c8ff07b5f95df0473a748a9831707079b940 (diff)
downloadlinux-d650a5148593b65a3c3f9a344f46b91b7dfe7713.tar.xz
x86: merge irq_regs.h
Impact: cleanup, better irq_regs code generation for x86_64 Make 64-bit use the same optimizations as 32-bit. Signed-off-by: Brian Gerst <brgerst@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/irq_regs.h')
-rw-r--r--arch/x86/include/asm/irq_regs.h36
1 files changed, 31 insertions, 5 deletions
diff --git a/arch/x86/include/asm/irq_regs.h b/arch/x86/include/asm/irq_regs.h
index 89c898ab298b..77843225b7ea 100644
--- a/arch/x86/include/asm/irq_regs.h
+++ b/arch/x86/include/asm/irq_regs.h
@@ -1,5 +1,31 @@
-#ifdef CONFIG_X86_32
-# include "irq_regs_32.h"
-#else
-# include "irq_regs_64.h"
-#endif
+/*
+ * Per-cpu current frame pointer - the location of the last exception frame on
+ * the stack, stored in the per-cpu area.
+ *
+ * Jeremy Fitzhardinge <jeremy@goop.org>
+ */
+#ifndef _ASM_X86_IRQ_REGS_H
+#define _ASM_X86_IRQ_REGS_H
+
+#include <asm/percpu.h>
+
+#define ARCH_HAS_OWN_IRQ_REGS
+
+DECLARE_PER_CPU(struct pt_regs *, irq_regs);
+
+static inline struct pt_regs *get_irq_regs(void)
+{
+ return percpu_read(irq_regs);
+}
+
+static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)
+{
+ struct pt_regs *old_regs;
+
+ old_regs = get_irq_regs();
+ percpu_write(irq_regs, new_regs);
+
+ return old_regs;
+}
+
+#endif /* _ASM_X86_IRQ_REGS_32_H */