Merge branch 'akpm' (Andrew's patch-bomb)

[linux-flexiantxendom0-3.2.10.git] / kernel / irq_work.c

diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index 6f0a431..c3c46c7 100644 (file)
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -6,9 +6,11 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/irq_work.h>
+#include <linux/percpu.h>
 #include <linux/hardirq.h>
+#include <asm/processor.h>
 
 /*
  * An entry can be in one of four states:
@@ -110,7 +112,7 @@ void irq_work_run(void)
        while (llnode != NULL) {
                work = llist_entry(llnode, struct irq_work, llnode);
 
-               llnode = llnode->next;
+               llnode = llist_next(llnode);
 
                /*
                 * Clear the PENDING bit, after this point the @work