1 files changed, 13 insertions, 3 deletions

diff --git a/mm/pdflush.c b/mm/pdflush.c
index a0a14c4d5072..15de509b68fd 100644
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -172,7 +172,16 @@ static int __pdflush(struct pdflush_work *my_work)
 static int pdflush(void *dummy)
 {
         struct pdflush_work my_work;
-        cpumask_t cpus_allowed;
+        cpumask_var_t cpus_allowed;
+
+        /*
+         * Since the caller doesn't even check kthread_run() worked, let's not
+         * freak out too much if this fails.
+         */
+        if (!alloc_cpumask_var(&cpus_allowed, GFP_KERNEL)) {
+                printk(KERN_WARNING "pdflush failed to allocate cpumask\n");
+                return 0;
+        }
 
         /*
          * pdflush can spend a lot of time doing encryption via dm-crypt.  We
@@ -187,8 +196,9 @@ static int pdflush(void *dummy)
          * This is needed as pdflush's are dynamically created and destroyed.
          * The boottime pdflush's are easily placed w/o these 2 lines.
          */
-        cpuset_cpus_allowed(current, &cpus_allowed);
-        set_cpus_allowed_ptr(current, &cpus_allowed);
+        cpuset_cpus_allowed(current, cpus_allowed);
+        set_cpus_allowed_ptr(current, cpus_allowed);
+        free_cpumask_var(cpus_allowed);
 
         return __pdflush(&my_work);
 }