From: Heiko Carstens Date: Mon, 30 May 2022 09:37:48 +0000 (+0200) Subject: s390/kexec: add __GFP_NORETRY to KEXEC_CONTROL_MEMORY_GFP X-Git-Tag: v5.19-rc1~40^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dade1707fdb4fb6a1d498aa8811779556b7ffbc;p=thirdparty%2Fkernel%2Flinux.git s390/kexec: add __GFP_NORETRY to KEXEC_CONTROL_MEMORY_GFP Avoid invoking the OOM-killer when allocating the control page. This is the s390 variant of commit dc5cccacf427 ("kexec: don't invoke OOM-killer for control page allocation"). Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h index 7f3c9ac34bd8d..9df3b4d647242 100644 --- a/arch/s390/include/asm/kexec.h +++ b/arch/s390/include/asm/kexec.h @@ -29,7 +29,7 @@ #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31) /* Allocate control page with GFP_DMA */ -#define KEXEC_CONTROL_MEMORY_GFP GFP_DMA +#define KEXEC_CONTROL_MEMORY_GFP (GFP_DMA | __GFP_NORETRY) /* Maximum address we can use for the crash control pages */ #define KEXEC_CRASH_CONTROL_MEMORY_LIMIT (-1UL)