diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
commit | 3856aa0c642dc34af7939e30f93e81eefbe0b935 (patch) | |
tree | e55e69097c7f3186e38dc1d3b3d4a05f4e68b1e2 /arch/parisc/lib/fixup.S | |
parent | aaaf92ba88d5a2664185ba20fd34308c8581d59f (diff) | |
parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) |
Merge branch 'linus' into x86/cpatip-x86-cpa-2008-05-17-15-12-20
Diffstat (limited to 'arch/parisc/lib/fixup.S')
-rw-r--r-- | arch/parisc/lib/fixup.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index d172d4245cdc..4821ad6d5269 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S @@ -23,6 +23,7 @@ #include <asm/assembly.h> #include <asm/errno.h> #include <linux/linkage.h> +#include <linux/init.h> #ifdef CONFIG_SMP .macro get_fault_ip t1 t2 @@ -55,7 +56,7 @@ .level LEVEL - .text + __HEAD .section .fixup, "ax" /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ |