shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Browse Source 
Conflicts:
	arch/arm64/Kconfig
	arch/arm64/crypto/Makefile
	arch/arm64/crypto/aes-glue.c
	arch/arm64/crypto/ghash-ce-core.S
	arch/arm64/crypto/ghash-ce-glue.c
	arch/arm64/include/asm/ptrace.h
	arch/arm64/include/asm/thread_info.h
	arch/arm64/kernel/fpsimd.c
	crypto/ablk_helper.c
	drivers/base/cpu.c
	drivers/hid/hid-core.c
	net/ipv4/raw.c
This commit is contained in:
Mark Brown
2014-09-08 12:05:48 +01:00
parent 4e65656dfa b60edabe23
commit bb0dddf615
100 changed files with 1286 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/uapi/asm-generic/unistd.h
View File

@@ -692,9 +692,19 @@ __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)
/* Backporting seccomp, skip a few ...
* #define __NR_sched_setattr 274
__SYSCALL(__NR_sched_setattr, sys_sched_setattr)
* #define __NR_sched_getattr 275
__SYSCALL(__NR_sched_getattr, sys_sched_getattr)
* #define __NR_renameat2 276
__SYSCALL(__NR_renameat2, sys_renameat2)
*/
#define __NR_seccomp 277
__SYSCALL(__NR_seccomp, sys_seccomp)
#undef __NR_syscalls
#define __NR_syscalls 274
#define __NR_syscalls 278
/*
* All syscalls below here should go away really,

2
include/uapi/linux/fib_rules.h
View File

@@ -49,6 +49,8 @@ enum {
FRA_TABLE, /* Extended table id */
FRA_FWMASK, /* mask for netfilter mark */
FRA_OIFNAME,
FRA_UID_START, /* UID range */
FRA_UID_END,
__FRA_MAX
};

2
include/uapi/linux/fs.h
View File

@@ -154,6 +154,8 @@ struct inodes_stat_t {
#define FITHAW _IOWR('X', 120, int) /* Thaw */
#define FITRIM _IOWR('X', 121, struct fstrim_range) /* Trim */
#define FIDTRIM _IOWR('f', 128, struct fstrim_range) /* Deep discard trim */
#define FS_IOC_GETFLAGS _IOR('f', 1, long)
#define FS_IOC_SETFLAGS _IOW('f', 2, long)
#define FS_IOC_GETVERSION _IOR('v', 1, long)

1
include/uapi/linux/rtnetlink.h
View File

@@ -297,6 +297,7 @@ enum rtattr_type_t {
RTA_TABLE,
RTA_MARK,
RTA_MFC_STATS,
RTA_UID,
__RTA_MAX
};

7
include/uapi/linux/seccomp.h
View File

@@ -10,6 +10,13 @@
#define SECCOMP_MODE_STRICT 1 /* uses hard-coded filter. */
#define SECCOMP_MODE_FILTER 2 /* uses user-supplied filter. */
/* Valid operations for seccomp syscall. */
#define SECCOMP_SET_MODE_STRICT 0
#define SECCOMP_SET_MODE_FILTER 1
/* Valid flags for SECCOMP_SET_MODE_FILTER */
#define SECCOMP_FILTER_FLAG_TSYNC 1
/*
* All BPF programs must return a 32-bit value.
* The bottom 16-bits are for optional return data.