From: "Wojciech 'Sas' Cieciwa" <cieciwa@alpha.zarz.agh.edu.pl>

I try to build linux-2.6.4-rc1 with cset-20040302_0009 on SPARC.
And I got error:

In file included from include/linux/unistd.h:9,
                 from init/main.c:21:
include/asm/unistd.h:464: error: conflicting types for `sys_ioperm'
include/linux/syscalls.h:291: error: previous declaration of `sys_ioperm'
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2



---

 25-akpm/include/asm-sparc/unistd.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN include/asm-sparc/unistd.h~sparc-sys_ioperm-fix include/asm-sparc/unistd.h
--- 25/include/asm-sparc/unistd.h~sparc-sys_ioperm-fix	Tue Mar  2 13:36:05 2004
+++ 25-akpm/include/asm-sparc/unistd.h	Tue Mar  2 13:36:05 2004
@@ -461,7 +461,7 @@ asmlinkage unsigned long sys_mmap2(
 				unsigned long addr, unsigned long len,
 				unsigned long prot, unsigned long flags,
 				unsigned long fd, unsigned long pgoff);
-asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on);
+asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 struct sigaction;
 asmlinkage long sys_rt_sigaction(int sig,
 				const struct sigaction __user *act,

_