2.6.25-git5

 mm

diff --git a/mm/pdflush.c b/mm/pdflush.c
index 8f6ee07..1c96cfc 100644
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -17,8 +17,8 @@
 #include <linux/gfp.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/fs.h>      // Needed by writeback.h
-#include <linux/writeback.h>   // Prototypes pdflush_operation()
+#include <linux/fs.h>      /* Needed by writeback.h     */
+#include <linux/writeback.h>   /* Prototypes pdflush_operation() */
 #include <linux/kthread.h>
 #include <linux/cpuset.h>
 #include <linux/freezer.h>
@@ -187,8 +187,8 @@ 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.
     */
-   cpus_allowed = cpuset_cpus_allowed(current);
-   set_cpus_allowed(current, cpus_allowed);
+   cpuset_cpus_allowed(current, &cpus_allowed);
+   set_cpus_allowed_ptr(current, &cpus_allowed);
 
    return __pdflush(&my_work);
 }