diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 09:09:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 09:09:43 -0700 |
commit | 713c0515a555952d53956196d47dec3a3ece860a (patch) | |
tree | 52ef61f6dbb338ad64e24662da859265d0c87a4d /arch/parisc/kernel/syscall.S | |
parent | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (diff) | |
parent | c913f94d86d75492af6222d268c53df236194afb (diff) | |
download | linux-713c0515a555952d53956196d47dec3a3ece860a.tar.gz linux-713c0515a555952d53956196d47dec3a3ece860a.tar.bz2 linux-713c0515a555952d53956196d47dec3a3ece860a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
arch/parisc/kernel/perf_asm.S: build fix
parisc: remove -traditional from assembler flags
parisc: use conditional macro for 64-bit wide ops
parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
arch/parisc/kernel/unaligned.c: use time_* macros
parisc: remove redundant display of free swap space in show_mem()
drivers/parisc: replace remaining __FUNCTION__ occurrences
parisc: replace remaining __FUNCTION__ occurrences
parisc: new termios definitions
parisc: fix trivial section name warnings
Diffstat (limited to 'arch/parisc/kernel/syscall.S')
-rw-r--r-- | arch/parisc/kernel/syscall.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index 69b6eebc466e..ae509d8cd03f 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -17,6 +17,7 @@ #include <asm/processor.h> #include <linux/linkage.h> +#include <linux/init.h> /* We fill the empty parts of the gateway page with * something that will kill the kernel or a @@ -26,7 +27,7 @@ .level LEVEL - .text + __HEAD .import syscall_exit,code .import syscall_exit_rfi,code @@ -636,7 +637,7 @@ END(sys_call_table64) All light-weight-syscall atomic operations will use this set of locks */ - .section .data + .section .data, "aw" .align PAGE_SIZE ENTRY(lws_lock_start) /* lws locks */ |