| Message ID | E1aviFE-0000jS-UI@rmk-PC.arm.linux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 28, 2016 at 2:58 PM, Russell King <rmk+kernel@arm.linux.org.uk> wrote: > 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. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > include/linux/kexec.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index 2cc643c6e870..1b32ab587f66 100644 > --- a/include/linux/kexec.h > +++ b/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 Reviewed-by: Pratyush Anand <panand@redhat.com>
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 2cc643c6e870..1b32ab587f66 100644 --- a/include/linux/kexec.h +++ b/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
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. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- include/linux/kexec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)