]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: unisys: visorbus: remove NORETRY
authorDavid Kershner <david.kershner@unisys.com>
Tue, 18 Apr 2017 20:55:08 +0000 (16:55 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Apr 2017 09:49:52 +0000 (11:49 +0200)
Allow retry when allocating memory.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorbus/visorchipset.c

index 67583692d95851ccd72135b739ab1bab86a3afa5..6e59d8d4b15bba987a27d89e6cb53666cfacf853 100644 (file)
@@ -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;