xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	include/asm-powerpc/unistd.h
	include/asm-sparc/unistd.h
	include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse
2006-05-24 09:22:21 +01:00
parent 2c23d62abb 387e2b0439
commit 66643de455
432 changed files with 9436 additions and 3783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-sparc/unistd.h
View File

@@ -316,12 +316,14 @@
#define __NR_pselect6 297
#define __NR_ppoll 298
#define __NR_unshare 299
#define __NR_set_robust_list 300
#define __NR_get_robust_list 301
#ifdef __KERNEL__
/* WARNING: You MAY NOT add syscall numbers larger than 299, since
/* WARNING: You MAY NOT add syscall numbers larger than 301, since
* all of the syscall tables in the Sparc kernel are
* sized to have 299 entries (starting at zero). Therefore
* find a free slot in the 0-299 range.
* sized to have 301 entries (starting at zero). Therefore
* find a free slot in the 0-301 range.
*/
#define _syscall0(type,name) \