Merge patch-bomb from Andrew Morton: - part of OCFS2 (review is laggy again) - procfs - slab - all of MM - zram, zbud - various other random things: arch, filesystems. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (164 commits) nosave: consolidate __nosave_{begin,end} in <asm/sections.h> include/linux/screen_info.h: remove unused ORIG_* macros kernel/sys.c: compat sysinfo syscall: fix undefined behavior kernel/sys.c: whitespace fixes acct: eliminate compile warning kernel/async.c: switch to pr_foo() include/linux/blkdev.h: use NULL instead of zero include/linux/kernel.h: deduplicate code implementing clamp* macros include/linux/kernel.h: rewrite min3, max3 and clamp using min and max alpha: use Kbuild logic to include <asm-generic/sections.h> frv: remove deprecated IRQF_DISABLED frv: remove unused cpuinfo_frv and friends to fix future build error zbud: avoid accessing last unused freelist zsmalloc: simplify init_zspage free obj linking mm/zsmalloc.c: correct comment for fullness group computation zram: use notify_free to account all free notifications zram: report maximum used memory zram: zram memory size limitation zsmalloc: change return value unit of zs_get_total_size_bytes zsmalloc: move pages_allocated to zs_pool ...
Showing the changes to include/uapi/linux (2 of 177 files). Show all
Unified · Split
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | #define KPF_KSM 21 | 32 | #define KPF_KSM 21 |
| 33 | #define KPF_THP 22 | 33 | #define KPF_THP 22 |
| 34 | #define KPF_BALLOON 23 | ||
| 34 | 35 | ||
| 35 | 36 | ||
| 36 | #endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */ | 37 | #endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */ |
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _LINUX_PRCTL_H | 1 | #ifndef _LINUX_PRCTL_H |
| 2 | #define _LINUX_PRCTL_H | 2 | #define _LINUX_PRCTL_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 4 | /* Values to pass as first argument to prctl() */ | 6 | /* Values to pass as first argument to prctl() */ |
| 5 | 7 | ||
| 6 | #define PR_SET_PDEATHSIG 1 /* Second arg is a signal */ | 8 | #define PR_SET_PDEATHSIG 1 /* Second arg is a signal */ |
| @@ -119,6 +121,31 @@ · 112 unmodified lines | |||
| 119 | # define PR_SET_MM_ENV_END 11 | 121 | # define PR_SET_MM_ENV_END 11 |
| 120 | # define PR_SET_MM_AUXV 12 | 122 | # define PR_SET_MM_AUXV 12 |
| 121 | # define PR_SET_MM_EXE_FILE 13 | 123 | # define PR_SET_MM_EXE_FILE 13 |
| 124 | # define PR_SET_MM_MAP 14 | ||
| 125 | # define PR_SET_MM_MAP_SIZE 15 | ||
| 126 | |||
| 127 | /* | ||
| 128 | * This structure provides new memory descriptor | ||
| 129 | * map which mostly modifies /proc/pid/stat[m] | ||
| 130 | * output for a task. This mostly done in a | ||
| 131 | * sake of checkpoint/restore functionality. | ||
| 132 | */ | ||
| 133 | struct prctl_mm_map { | ||
| 134 | __u64 start_code; /* code section bounds */ | ||
| 135 | __u64 end_code; | ||
| 136 | __u64 start_data; /* data section bounds */ | ||
| 137 | __u64 end_data; | ||
| 138 | __u64 start_brk; /* heap for brk() syscall */ | ||
| 139 | __u64 brk; | ||
| 140 | __u64 start_stack; /* stack starts at */ | ||
| 141 | __u64 arg_start; /* command line arguments bounds */ | ||
| 142 | __u64 arg_end; | ||
| 143 | __u64 env_start; /* environment variables bounds */ | ||
| 144 | __u64 env_end; | ||
| 145 | __u64 *auxv; /* auxiliary vector */ | ||
| 146 | __u32 auxv_size; /* vector size */ | ||
| 147 | __u32 exe_fd; /* /proc/$pid/exe link file */ | ||
| 148 | }; | ||
| 122 | 149 | ||
| 123 | /* | 150 | /* |
| 124 | * Set specific pid that is allowed to ptrace the current task. | 151 | * Set specific pid that is allowed to ptrace the current task. |