History

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

Conflicts: arch/x86/kernel/traps.c

Ingo Molnar committed 12 years ago

Commit ec000102 parents 8c6e549 e041e32623 files · +7845 −4166Browse files

Showing the changes to include/uapi (4 of 623 files). Show all

Unified · Split

4 files
  1. include/uapi/asm-generic/resource.h +0 −7
  2. include/uapi/asm-generic/unistd.h +3 −1
  3. include/uapi/linux/audit.h +12 −0
  4. include/uapi/linux/nl80211.h +3 −1
include/uapi/asm-generic/resource.h+0−7
@@ -57,12 +57,5 @@ · 56 unmodified lines
57# define RLIM_INFINITY (~0UL)57# define RLIM_INFINITY (~0UL)
58#endif58#endif
59 59
60/*
61 * RLIMIT_STACK default maximum - some architectures override it:
62 */
63#ifndef _STK_LIM_MAX
64# define _STK_LIM_MAX RLIM_INFINITY
65#endif
66
67 60
68#endif /* _UAPI_ASM_GENERIC_RESOURCE_H */61#endif /* _UAPI_ASM_GENERIC_RESOURCE_H */
include/uapi/asm-generic/unistd.h+3−1
@@ -697,9 +697,11 @@ __SYSCALL(__NR_finit_module, sys_finit_module) · 696 unmodified lines
697__SYSCALL(__NR_sched_setattr, sys_sched_setattr)697__SYSCALL(__NR_sched_setattr, sys_sched_setattr)
698#define __NR_sched_getattr 275698#define __NR_sched_getattr 275
699__SYSCALL(__NR_sched_getattr, sys_sched_getattr)699__SYSCALL(__NR_sched_getattr, sys_sched_getattr)
700#define __NR_renameat2 276
701__SYSCALL(__NR_renameat2, sys_renameat2)
700 702
701#undef __NR_syscalls703#undef __NR_syscalls
702#define __NR_syscalls 276704#define __NR_syscalls 277
703 705
704/*706/*
705 * All syscalls below here should go away really,707 * All syscalls below here should go away really,
include/uapi/linux/audit.h+12−0
@@ -331,9 +331,17 @@ enum { · 330 unmodified lines
331#define AUDIT_FAIL_PRINTK 1331#define AUDIT_FAIL_PRINTK 1
332#define AUDIT_FAIL_PANIC 2332#define AUDIT_FAIL_PANIC 2
333 333
334/*
335 * These bits disambiguate different calling conventions that share an
336 * ELF machine type, bitness, and endianness
337 */
338#define __AUDIT_ARCH_CONVENTION_MASK 0x30000000
339#define __AUDIT_ARCH_CONVENTION_MIPS64_N32 0x20000000
340
334/* distinguish syscall tables */341/* distinguish syscall tables */
335#define __AUDIT_ARCH_64BIT 0x80000000342#define __AUDIT_ARCH_64BIT 0x80000000
336#define __AUDIT_ARCH_LE 0x40000000343#define __AUDIT_ARCH_LE 0x40000000
344
337#define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)345#define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
338#define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE)346#define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE)
339#define AUDIT_ARCH_ARMEB (EM_ARM)347#define AUDIT_ARCH_ARMEB (EM_ARM)
@@ -346,7 +354,11 @@ enum { · 6 unmodified lines
346#define AUDIT_ARCH_MIPS (EM_MIPS)354#define AUDIT_ARCH_MIPS (EM_MIPS)
347#define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE)355#define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE)
348#define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT)356#define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT)
357#define AUDIT_ARCH_MIPS64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|\
358 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
349#define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)359#define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
360#define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE|\
361 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
350#define AUDIT_ARCH_OPENRISC (EM_OPENRISC)362#define AUDIT_ARCH_OPENRISC (EM_OPENRISC)
351#define AUDIT_ARCH_PARISC (EM_PARISC)363#define AUDIT_ARCH_PARISC (EM_PARISC)
352#define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT)364#define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT)
include/uapi/linux/nl80211.h+3−1
@@ -3856,6 +3856,8 @@ enum nl80211_ap_sme_features { · 3855 unmodified lines
3856 * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested3856 * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested
3857 * to work properly to suppport receiving regulatory hints from3857 * to work properly to suppport receiving regulatory hints from
3858 * cellular base stations.3858 * cellular base stations.
3859 * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only
3860 * here to reserve the value for API/ABI compatibility)
3859 * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of3861 * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
3860 * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station3862 * equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
3861 * mode3863 * mode
@@ -3897,7 +3899,7 @@ enum nl80211_feature_flags { · 35 unmodified lines
3897 NL80211_FEATURE_HT_IBSS = 1 << 1,3899 NL80211_FEATURE_HT_IBSS = 1 << 1,
3898 NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,3900 NL80211_FEATURE_INACTIVITY_TIMER = 1 << 2,
3899 NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3,3901 NL80211_FEATURE_CELL_BASE_REG_HINTS = 1 << 3,
3900 /* bit 4 is reserved - don't use */3902 NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL = 1 << 4,
3901 NL80211_FEATURE_SAE = 1 << 5,3903 NL80211_FEATURE_SAE = 1 << 5,
3902 NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6,3904 NL80211_FEATURE_LOW_PRIORITY_SCAN = 1 << 6,
3903 NL80211_FEATURE_SCAN_FLUSH = 1 << 7,3905 NL80211_FEATURE_SCAN_FLUSH = 1 << 7,