The patch titled Subject: exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes has been added to the -mm tree. Its filename is exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes use max_t Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/exec.c~exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes +++ a/fs/exec.c @@ -474,7 +474,7 @@ static int prepare_arg_pages(struct linu * We've historically supported up to 32 pages (ARG_MAX) * of argument strings even with small stacks */ - limit = max(limit, (unsigned long)ARG_MAX); + limit = max_t(unsigned long, limit, ARG_MAX); /* * We must account for the size of all the argv and envp pointers to * the argv and envp strings, since they will also take up space in _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-slab-remove-unnecessary-unlikely-fix.patch mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch mm-page_owner-clamp-read-count-to-page_size-fix.patch mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch memory_hotplug-free-pages-as-higher-order-fix.patch exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch