Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...

[linux-2.6-block.git] / kernel / locking / test-ww_mutex.c

diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index 39f56c870051b505611746ff0033cc6a7f6e1a10..0e4cd64ad2c018cf4ad2375004b966d6de49c241 100644 (file)
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -362,7 +362,7 @@ static int *get_random_order(int count)
        int *order;
        int n, r, tmp;
 
-       order = kmalloc_array(count, sizeof(*order), GFP_TEMPORARY);
+       order = kmalloc_array(count, sizeof(*order), GFP_KERNEL);
        if (!order)
                return order;