Skip to content

L
linux
Commit 0c0cacdc authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6 

into nuts.davemloft.net:/disk1/BK/sparc-2.6
parents b2d271d9 505fc148
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
include/asm-sparc/unistd.h
View file @ 0c0cacdc
...@@ -461,7 +461,6 @@ asmlinkage unsigned long sys_mmap2( ...@@ -461,7 +461,6 @@ asmlinkage unsigned long sys_mmap2(
unsigned long addr, unsigned long len, unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags, unsigned long prot, unsigned long flags,
unsigned long fd, unsigned long pgoff); unsigned long fd, unsigned long pgoff);
asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on);
struct sigaction; struct sigaction;
asmlinkage long sys_rt_sigaction(int sig, asmlinkage long sys_rt_sigaction(int sig,
const struct sigaction __user *act, const struct sigaction __user *act,
......
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