From: David Kershner Date: Tue, 18 Apr 2017 20:55:08 +0000 (-0400) Subject: staging: unisys: visorbus: remove NORETRY X-Git-Tag: v4.12-rc1~84^2~71 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8c8c975f37b2097cd23b7394fff0192c073b808f;p=linux.git staging: unisys: visorbus: remove NORETRY Allow retry when allocating memory. Signed-off-by: David Kershner Reviewed-by: Tim Sell Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 67583692d958..6e59d8d4b15b 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -312,7 +312,7 @@ parser_string_get(struct parser_context *ctx) } if (value_length < 0) /* '\0' was not included in the length */ value_length = nscan; - value = kmalloc(value_length + 1, GFP_KERNEL | __GFP_NORETRY); + value = kmalloc(value_length + 1, GFP_KERNEL); if (!value) return NULL; if (value_length > 0) @@ -1033,7 +1033,7 @@ parahotplug_request_create(struct controlvm_message *msg) { struct parahotplug_request *req; - req = kmalloc(sizeof(*req), GFP_KERNEL | __GFP_NORETRY); + req = kmalloc(sizeof(*req), GFP_KERNEL); if (!req) return NULL; @@ -1571,7 +1571,7 @@ parser_init_byte_stream(u64 addr, u32 bytes, bool local, bool *retry) *retry = true; return NULL; } - ctx = kzalloc(allocbytes, GFP_KERNEL | __GFP_NORETRY); + ctx = kzalloc(allocbytes, GFP_KERNEL); if (!ctx) { *retry = true; return NULL;