forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 3.14-rc5 into char-misc-next

Browse source 
We want these fixes in here as well.
This commit is contained in:
Greg Kroah-Hartman 2014-03-02 19:53:09 -08:00
commit aa074c1c80
169 changed files with 1891 additions and 1153 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/uapi/asm-generic/unistd.h
View file

@ -692,9 +692,13 @@ __SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \
__SYSCALL(__NR_kcmp, sys_kcmp)
#define __NR_finit_module 273
__SYSCALL(__NR_finit_module, sys_finit_module)
#define __NR_sched_setattr 274
__SYSCALL(__NR_sched_setattr, sys_sched_setattr)
#define __NR_sched_getattr 275
__SYSCALL(__NR_sched_getattr, sys_sched_getattr)
#undef __NR_syscalls
#define __NR_syscalls 274
#define __NR_syscalls 276
/*
* All syscalls below here should go away really,