3 files changed, 8 insertions, 5 deletions

diff --git a/include/asm-x86/pgalloc_64.h b/include/asm-x86/pgalloc_64.h
index 315314ce4bfb..4f6220db22b1 100644
--- a/include/asm-x86/pgalloc_64.h
+++ b/include/asm-x86/pgalloc_64.h
@@ -42,19 +42,21 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud)
 static inline void pgd_list_add(pgd_t *pgd)
 {
         struct page *page = virt_to_page(pgd);
+        unsigned long flags;
 
-        spin_lock(&pgd_lock);
+        spin_lock_irqsave(&pgd_lock, flags);
         list_add(&page->lru, &pgd_list);
-        spin_unlock(&pgd_lock);
+        spin_unlock_irqrestore(&pgd_lock, flags);
 }
 
 static inline void pgd_list_del(pgd_t *pgd)
 {
         struct page *page = virt_to_page(pgd);
+        unsigned long flags;
 
-        spin_lock(&pgd_lock);
+        spin_lock_irqsave(&pgd_lock, flags);
         list_del(&page->lru);
-        spin_unlock(&pgd_lock);
+        spin_unlock_irqrestore(&pgd_lock, flags);
 }
 
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index c4e00161a247..b0fd85ab9efb 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -79,7 +79,7 @@ struct cpuidle_state_kobj {
 };
 
 struct cpuidle_device {
-        int                     enabled:1;
+        unsigned int            enabled:1;
         unsigned int            cpu;
 
         int                     last_residency;
diff --git a/include/linux/init.h b/include/linux/init.h
index 90cdbbbbe077..a404a0055dd7 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -110,6 +110,7 @@
 #define __FINIT         .previous
 
 #define __INITDATA      .section        ".init.data","aw"
+#define __FINITDATA     .previous
 
 #define __DEVINIT        .section       ".devinit.text", "ax"
 #define __DEVINITDATA    .section       ".devinit.data", "aw"