Merge branch 'linus' into x86/platform

Reason: Import mainline device tree changes on which further patches
        depend on or conflict.

Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 14 insertions, 15 deletions

diff --git a/arch/microblaze/include/asm/irqflags.h b/arch/microblaze/include/asm/irqflags.h
index 5fd31905775d..c4532f032b3b 100644
--- a/arch/microblaze/include/asm/irqflags.h
+++ b/arch/microblaze/include/asm/irqflags.h
@@ -12,7 +12,7 @@
 #include <linux/types.h>
 #include <asm/registers.h>
 
-#ifdef CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
+#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
 
 static inline unsigned long arch_local_irq_save(void)
 {
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h
index b23f68075879..885574a73f01 100644
--- a/arch/microblaze/include/asm/pgtable.h
+++ b/arch/microblaze/include/asm/pgtable.h
@@ -411,20 +411,19 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 static inline unsigned long pte_update(pte_t *p, unsigned long clr,
                                 unsigned long set)
 {
-        unsigned long old, tmp, msr;
-
-        __asm__ __volatile__("\
-        msrclr  %2, 0x2\n\
-        nop\n\
-        lw      %0, %4, r0\n\
-        andn    %1, %0, %5\n\
-        or      %1, %1, %6\n\
-        sw      %1, %4, r0\n\
-        mts     rmsr, %2\n\
-        nop"
-        : "=&r" (old), "=&r" (tmp), "=&r" (msr), "=m" (*p)
-        : "r" ((unsigned long)(p + 1) - 4), "r" (clr), "r" (set), "m" (*p)
-        : "cc");
+        unsigned long flags, old, tmp;
+
+        raw_local_irq_save(flags);
+
+        __asm__ __volatile__(   "lw     %0, %2, r0      \n"
+                                "andn   %1, %0, %3      \n"
+                                "or     %1, %1, %4      \n"
+                                "sw     %1, %2, r0      \n"
+                        : "=&r" (old), "=&r" (tmp)
+                        : "r" ((unsigned long)(p + 1) - 4), "r" (clr), "r" (set)
+                        : "cc");
+
+        raw_local_irq_restore(flags);
 
         return old;
 }