Messages in this thread | | | Date | Sat, 14 May 2011 04:51:20 +0200 | From | Andi Kleen <> | Subject | Re: [PATCH 5/5] Hook up sysconf syscall for all architectures |
| |
On Fri, May 13, 2011 at 09:21:24PM -0400, David Miller wrote: > From: Andi Kleen <andi@firstfloor.org> > Date: Fri, 13 May 2011 16:24:19 -0700 > > > diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h > > index 9d897b6..0b0b362 100644 > > --- a/arch/sparc/include/asm/unistd.h > > +++ b/arch/sparc/include/asm/unistd.h > > @@ -404,8 +404,9 @@ > > #define __NR_open_by_handle_at 333 > > #define __NR_clock_adjtime 334 > > #define __NR_syncfs 335 > > +#define __NR_sysconf 336 > > > > -#define NR_syscalls 336 > > +#define NR_syscalls 337 > > > > x86, powerpc, and sparc entries will conflict with already assigned > slots for sys_sendmmsg() in networking tree.
Thanks. I'll fix it up on the next try, hopefully those changes are in mainline then.
-Andi
-- ak@linux.intel.com -- Speaking for myself only.
| |