linux-next: manual merge of the limits tree with the tile tree
in [Kernel]
|
Prev: [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections
Next: linux-next: manual merge of the limits tree with the fsnotify tree
From: Stephen Rothwell on 19 Jul 2010 23:50 Hi Jiri, Today's linux-next merge of the limits tree got a conflict in include/asm-generic/unistd.h between commits 5360bd776f73d0a7da571d72a09a03f237e99900 ("Fix up the "generic" unistd.h ABI to be more useful") and b51cae21ee66f77a368428e6bdf75a0c012c9fd7 ("Add wait4() back to the set of <asm-generic/unistd.h> syscalls") from the tile tree and commit f33ebbe9da2c3c24664a0ad4f8fd83f293547e63 ("unistd: add __NR_prlimit64 syscall numbers") from the limits tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc include/asm-generic/unistd.h index c17cebc,0dfd517..0000000 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@@ -631,18 -626,11 +631,20 @@@ __SYSCALL(__NR_perf_event_open, sys_per __SYSCALL(__NR_accept4, sys_accept4) #define __NR_recvmmsg 243 __SYSCALL(__NR_recvmmsg, sys_recvmmsg) + #define __NR_prlimit64 244 + __SYSCALL(__NR_prlimit64, sys_prlimit64) +/* + * Architectures may provide up to 16 syscalls of their own + * starting with this value. + */ - #define __NR_arch_specific_syscall 244 ++#define __NR_arch_specific_syscall 245 + +#define __NR_wait4 260 +__SYSCALL(__NR_wait4, sys_wait4) + #undef __NR_syscalls -#define __NR_syscalls 245 +#define __NR_syscalls 261 /* * All syscalls below here should go away really, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Chris Metcalf on 20 Jul 2010 00:20 On 7/19/2010 11:48 PM, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the limits tree got a conflict in > include/asm-generic/unistd.h between commits > 5360bd776f73d0a7da571d72a09a03f237e99900 ("Fix up the "generic" unistd.h > ABI to be more useful") and b51cae21ee66f77a368428e6bdf75a0c012c9fd7 > ("Add wait4() back to the set of <asm-generic/unistd.h> syscalls") from > the tile tree and commit f33ebbe9da2c3c24664a0ad4f8fd83f293547e63 > ("unistd: add __NR_prlimit64 syscall numbers") from the limits tree. > > I fixed it up (see below) and can carry the fix as necessary. > Jiri, would it be possible to put __NR_prlimit64 as number 261 in <asm-generic/syscall.h>? This would avoid the requirement for Tilera users to have a "flag day" to renumber some of our syscalls. I assume there are no users at all of this flavor of the __NR_prlimit64 syscall number yet otherwise, except the "score" architecture folks who presumably wouldn't have started trying to use the syscall yet. Thanks, and Stephen, thanks for the fixup. -- Chris Metcalf, Tilera Corp. http://www.tilera.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jiri Slaby on 20 Jul 2010 04:10
On 07/20/2010 06:18 AM, Chris Metcalf wrote: > Jiri, would it be possible to put __NR_prlimit64 as number 261 in > <asm-generic/syscall.h>? Hi, I assume you meant asm-generic/unistd.h. Yes, I will do that. thank you both, -- js -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |