* [SPARC][patch] sys_ioperm
@ 2004-03-02 12:24 Wojciech 'Sas' Cieciwa
2004-03-03 3:46 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Wojciech 'Sas' Cieciwa @ 2004-03-02 12:24 UTC (permalink / raw)
To: linux-kernel
Hi,
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
Fixed this (?) by this patch:
--- linux-2.6.4-rc1/include/asm-sparc/unistd.h.org 2004-02-27 23:20:57.000000000 +0100
+++ linux-2.6.4-rc1/include/asm-sparc/unistd.h 2004-03-02 13:10:39.229091144 +0100
@@ -461,7 +461,7 @@
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,
--
{Wojciech 'Sas' Cieciwa} {Member of PLD Team }
{e-mail: cieciwa@alpha.zarz.agh.edu.pl, http://www2.zarz.agh.edu.pl/~cieciwa}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [SPARC][patch] sys_ioperm
2004-03-02 12:24 [SPARC][patch] sys_ioperm Wojciech 'Sas' Cieciwa
@ 2004-03-03 3:46 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-03-03 3:46 UTC (permalink / raw)
To: Wojciech 'Sas' Cieciwa; +Cc: linux-kernel, wesolows
On Tue, 2 Mar 2004 13:24:03 +0100 (CET)
Wojciech 'Sas' Cieciwa <cieciwa@alpha.zarz.agh.edu.pl> wrote:
> 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
>
> Fixed this (?) by this patch:
We can just remove that line entirely from unistd.h, and that is the
change I have added to my tree.
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/03/02 19:40:14-08:00 davem@nuts.davemloft.net
# [SPARC]: Kill sys_ioperm decl from unistd.h
#
# include/asm-sparc/unistd.h
# 2004/03/02 19:37:09-08:00 davem@nuts.davemloft.net +0 -1
# [SPARC]: Kill sys_ioperm decl from unistd.h
#
diff -Nru a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
--- a/include/asm-sparc/unistd.h Tue Mar 2 19:43:19 2004
+++ b/include/asm-sparc/unistd.h Tue Mar 2 19:43:19 2004
@@ -461,7 +461,6 @@
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);
struct sigaction;
asmlinkage long sys_rt_sigaction(int sig,
const struct sigaction __user *act,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-03-03 3:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-02 12:24 [SPARC][patch] sys_ioperm Wojciech 'Sas' Cieciwa
2004-03-03 3:46 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox