diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:02:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 05:02:50 -0800 |
| commit | 0f994f5d595144773374bad540af2898499df008 (patch) | |
| tree | 7500eb465bb784744850a69be1e49009b9efd251 /include | |
| parent | 76a9bdec30f296b88c39016858c4ffd0999965f0 (diff) | |
| parent | 4b86717c59be57eb2835a1f3c358a625b8b9d10a (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/unistd.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/unistd.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 61462b047419..cbe9c4476eb3 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h @@ -453,6 +453,8 @@ static __inline__ _syscall1(int,close,int,fd) static __inline__ _syscall1(int,_exit,int,exitcode) static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) +#include <linux/linkage.h> + asmlinkage unsigned long sys_mmap( unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 070bc905a7a1..265a2348873a 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h @@ -443,6 +443,8 @@ static __inline__ _syscall1(int,close,int,fd) static __inline__ _syscall1(int,_exit,int,exitcode) static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) +#include <linux/linkage.h> + asmlinkage unsigned long sys_mmap( unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, |