Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 1974cf191b03..10a642df014e 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -80,7 +80,7 @@ static inline void local_irq_disable(void)
         __asm__ __volatile__("wrteei 0": : :"memory");
 #else
         unsigned long msr;
-        __asm__ __volatile__("": : :"memory");
+
         msr = mfmsr();
         SET_MSR_EE(msr & ~MSR_EE);
 #endif
@@ -92,7 +92,7 @@ static inline void local_irq_enable(void)
         __asm__ __volatile__("wrteei 1": : :"memory");
 #else
         unsigned long msr;
-        __asm__ __volatile__("": : :"memory");
+
         msr = mfmsr();
         SET_MSR_EE(msr | MSR_EE);
 #endif
@@ -108,7 +108,6 @@ static inline void local_irq_save_ptr(unsigned long *flags)
 #else
         SET_MSR_EE(msr & ~MSR_EE);
 #endif
-        __asm__ __volatile__("": : :"memory");
 }
 
 #define local_save_flags(flags) ((flags) = mfmsr())