The patch titled Subject: kexec: don't invoke OOM-killer for control page allocation has been added to the -mm tree. Its filename is kexec-dont-invoke-oom-killer-for-control-page-allocation.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/kexec-dont-invoke-oom-killer-for-control-page-allocation.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/kexec-dont-invoke-oom-killer-for-control-page-allocation.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/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Subject: kexec: don't invoke OOM-killer for control page allocation If we are unable to find a suitable page when allocating the control page, do not invoke the OOM-killer: killing processes probably isn't going to help. Link: http://lkml.kernel.org/r/E1b8ko9-0004HG-R5@xxxxxxxxxxxxxxxxxxxxxx Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Reviewed-by: Pratyush Anand <panand@xxxxxxxxxx> Acked-by: Baoquan He <bhe@xxxxxxxxxx> Cc: Keerthy <j-keerthy@xxxxxx> Cc: Vitaly Andrianov <vitalya@xxxxxx> Cc: Eric Biederman <ebiederm@xxxxxxxxxxxx> Cc: Dave Young <dyoung@xxxxxxxxxx> Cc: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: Simon Horman <horms@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kexec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/kexec.h~kexec-dont-invoke-oom-killer-for-control-page-allocation include/linux/kexec.h --- a/include/linux/kexec.h~kexec-dont-invoke-oom-killer-for-control-page-allocation +++ a/include/linux/kexec.h @@ -41,7 +41,7 @@ #endif #ifndef KEXEC_CONTROL_MEMORY_GFP -#define KEXEC_CONTROL_MEMORY_GFP GFP_KERNEL +#define KEXEC_CONTROL_MEMORY_GFP (GFP_KERNEL | __GFP_NORETRY) #endif #ifndef KEXEC_CONTROL_PAGE_SIZE _ Patches currently in -mm which might be from rmk+kernel@xxxxxxxxxxxxxxxx are arm-kdump-advertise-boot-aliased-crash-kernel-resource.patch arm-kexec-advertise-location-of-bootable-ram.patch kexec-dont-invoke-oom-killer-for-control-page-allocation.patch kexec-ensure-user-memory-sizes-do-not-wrap.patch kdump-arrange-for-paddr_vmcoreinfo_note-to-return-phys_addr_t.patch kexec-allow-architectures-to-override-boot-mapping.patch arm-kexec-fix-kexec-for-keystone-2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html