diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 11:54:43 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 11:54:43 +0200 |
commit | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (patch) | |
tree | f3e270923fa36c773eee3bb1f9981aab1711d938 /arch/parisc/lib/fixup.S | |
parent | 77b52b4c5c66175553ee59eb43f74366f1e54bde (diff) | |
parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) |
Merge branch 'linus' into x86/pat
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 */ |