From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: [PATCH 08/12] kexec: don't invoke OOM-killer for control page allocation Date: Thu, 28 Apr 2016 10:28:24 +0100 Message-ID: References: <20160428092644.GX19428@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20160428092644.GX19428@n2100.arm.linux.org.uk> Content-Disposition: inline Sender: linux-ia64-owner@vger.kernel.org To: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org, Eric Biederman , Fenghua Yu , Haren Myneni , Ian Campbell , Jonathan Corbet , kexec@lists.infradead.org, Kumar Gala , linux-doc@vger.kernel.org, linux-ia64@vger.kernel.org, Mark Rutland , Pawel Moll , Rob Herring , Santosh Shilimkar , Tony Luck , Vivek Goyal List-Id: devicetree@vger.kernel.org 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 --- 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 -- 2.1.0