diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-08-02 17:05:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-02 19:35:26 -0400 |
| commit | dc5cccacf4272da4aba20a1fc0804d59d985ab32 (patch) | |
| tree | e4161e326bdbffb02114a7f2bfce9fb4c5f8109c | |
| parent | 966fab00b0e19e0db3cb11d81bda5d0940176d5e (diff) | |
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@rmk-PC.armlinux.org.uk
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Reviewed-by: Pratyush Anand <panand@redhat.com>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Vitaly Andrianov <vitalya@ti.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Simon Horman <horms@verge.net.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/kexec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index e8acb2b43dd9..ce2fe197f583 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #ifndef KEXEC_CONTROL_MEMORY_GFP | 43 | #ifndef KEXEC_CONTROL_MEMORY_GFP |
| 44 | #define KEXEC_CONTROL_MEMORY_GFP GFP_KERNEL | 44 | #define KEXEC_CONTROL_MEMORY_GFP (GFP_KERNEL | __GFP_NORETRY) |
| 45 | #endif | 45 | #endif |
| 46 | 46 | ||
| 47 | #ifndef KEXEC_CONTROL_PAGE_SIZE | 47 | #ifndef KEXEC_CONTROL_PAGE_SIZE |