5 files changed, 11 insertions, 4 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 79700fa2dfc4..74c6c7fce749 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
+#include <linux/export.h>
 #include <linux/device.h>
 #include <linux/types.h>
 #include <linux/sched.h>
diff --git a/lib/idr.c b/lib/idr.c
index bbf211aea4eb..ed055b297c81 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -944,6 +944,7 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
 {
         int ret, id;
         unsigned int max;
+        unsigned long flags;
 
         BUG_ON((int)start < 0);
         BUG_ON((int)end < 0);
@@ -959,7 +960,7 @@ again:
         if (!ida_pre_get(ida, gfp_mask))
                 return -ENOMEM;
 
-        spin_lock(&simple_ida_lock);
+        spin_lock_irqsave(&simple_ida_lock, flags);
         ret = ida_get_new_above(ida, start, &id);
         if (!ret) {
                 if (id > max) {
@@ -969,7 +970,7 @@ again:
                         ret = id;
                 }
         }
-        spin_unlock(&simple_ida_lock);
+        spin_unlock_irqrestore(&simple_ida_lock, flags);
 
         if (unlikely(ret == -EAGAIN))
                 goto again;
@@ -985,10 +986,12 @@ EXPORT_SYMBOL(ida_simple_get);
  */
 void ida_simple_remove(struct ida *ida, unsigned int id)
 {
+        unsigned long flags;
+
         BUG_ON((int)id < 0);
-        spin_lock(&simple_ida_lock);
+        spin_lock_irqsave(&simple_ida_lock, flags);
         ida_remove(ida, id);
-        spin_unlock(&simple_ida_lock);
+        spin_unlock_irqrestore(&simple_ida_lock, flags);
 }
 EXPORT_SYMBOL(ida_simple_remove);
 
diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index b595f560bee7..8b02f60ffc86 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -17,6 +17,7 @@
  */
 
 #include <linux/raid/pq.h>
+#include <linux/module.h>
 #ifndef __KERNEL__
 #include <sys/mman.h>
 #include <stdio.h>
diff --git a/lib/raid6/mktables.c b/lib/raid6/mktables.c
index 3b1500843bba..8a3780902cec 100644
--- a/lib/raid6/mktables.c
+++ b/lib/raid6/mktables.c
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
         uint8_t exptbl[256], invtbl[256];
 
         printf("#include <linux/raid/pq.h>\n");
+        printf("#include <linux/export.h>\n");
 
         /* Compute multiplication table */
         printf("\nconst u8  __attribute__((aligned(256)))\n"
diff --git a/lib/raid6/recov.c b/lib/raid6/recov.c
index 8590d19cf522..fe275d7b6b36 100644
--- a/lib/raid6/recov.c
+++ b/lib/raid6/recov.c
@@ -18,6 +18,7 @@
  * the syndrome.)
  */
 
+#include <linux/export.h>
 #include <linux/raid/pq.h>
 
 /* Recover two failed data blocks. */