X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=mm%2Fsparse.c;h=86c52ab80878f1df2239ae9270c5f49b643ab1b0;hb=9bcfcaf5e9cc887eb39236e43bdbe4b4b2572229;hp=e0a3fe48aa3745bebd710ff80d8cad6215dd244d;hpb=37224470c8c6d90a4062e76a08d4dc1fcf91fc89;p=linux-2.6-omap-h63xx.git

diff --git a/mm/sparse.c b/mm/sparse.c
index e0a3fe48aa3..86c52ab8087 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -1,7 +1,6 @@
 /*
  * sparse memory mappings.
  */
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/bootmem.h>
@@ -45,7 +44,7 @@ static struct mem_section *sparse_index_alloc(int nid)
 
 static int sparse_index_init(unsigned long section_nr, int nid)
 {
-	static spinlock_t index_init_lock = SPIN_LOCK_UNLOCKED;
+	static DEFINE_SPINLOCK(index_init_lock);
 	unsigned long root = SECTION_NR_TO_ROOT(section_nr);
 	struct mem_section *section;
 	int ret = 0;