Skip to content

L
linux
Commit 4b86717c authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6 

into kernel.bkbits.net:/home/davem/sparc-2.6
parents 92c06c66 57d3eae4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
include/asm-sparc/unistd.h
View file @ 4b86717c
...@@ -453,6 +453,8 @@ static __inline__ _syscall1(int,close,int,fd) ...@@ -453,6 +453,8 @@ static __inline__ _syscall1(int,close,int,fd)
static __inline__ _syscall1(int,_exit,int,exitcode) static __inline__ _syscall1(int,_exit,int,exitcode)
static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
#include <linux/linkage.h>
asmlinkage unsigned long sys_mmap( asmlinkage unsigned long sys_mmap(
unsigned long addr, unsigned long len, unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags, unsigned long prot, unsigned long flags,
......
include/asm-sparc64/unistd.h
View file @ 4b86717c
...@@ -443,6 +443,8 @@ static __inline__ _syscall1(int,close,int,fd) ...@@ -443,6 +443,8 @@ static __inline__ _syscall1(int,close,int,fd)
static __inline__ _syscall1(int,_exit,int,exitcode) static __inline__ _syscall1(int,_exit,int,exitcode)
static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
#include <linux/linkage.h>
asmlinkage unsigned long sys_mmap( asmlinkage unsigned long sys_mmap(
unsigned long addr, unsigned long len, unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags, unsigned long prot, unsigned long flags,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7