Merge tag 'gfs2-for-linus-4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / powerpc / platforms / pseries / suspend.c

diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index e76aefa..89726f0 100644 (file)
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -151,7 +151,7 @@ static ssize_t store_hibernate(struct device *dev,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       if (!alloc_cpumask_var(&offline_mask, GFP_TEMPORARY))
+       if (!alloc_cpumask_var(&offline_mask, GFP_KERNEL))
                return -ENOMEM;
 
        stream_id = simple_strtoul(buf, NULL, 16);