141 files changed, 2335 insertions, 1847 deletions
diff --git a/arch/alpha/include/asm/irqflags.h b/arch/alpha/include/asm/irqflags.h
new file mode 100644
index 00000000000..299bbc7e9d7
--- /dev/null
+++ b/arch/alpha/include/asm/irqflags.h
@@ -0,0 +1,67 @@
+#ifndef __ALPHA_IRQFLAGS_H
+#define __ALPHA_IRQFLAGS_H
+#include <asm/system.h>
+#define IPL_MIN         0
+#define IPL_SW0         1
+#define IPL_SW1         2
+#define IPL_DEV0        3
+#define IPL_DEV1        4
+#define IPL_TIMER       5
+#define IPL_PERF        6
+#define IPL_POWERFAIL   6
+#define IPL_MCHECK      7
+#define IPL_MAX         7
+#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
+#undef IPL_MIN
+#define IPL_MIN         __min_ipl
+extern int __min_ipl;
+#endif
+#define getipl()                (rdps() & 7)
+#define setipl(ipl)             ((void) swpipl(ipl))
+static inline unsigned long arch_local_save_flags(void)
+{
+        return rdps();
+}
+static inline void arch_local_irq_disable(void)
+{
+        setipl(IPL_MAX);
+        barrier();
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = swpipl(IPL_MAX);
+        barrier();
+        return flags;
+}
+static inline void arch_local_irq_enable(void)
+{
+        barrier();
+        setipl(IPL_MIN);
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        barrier();
+        setipl(flags);
+        barrier();
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return flags == IPL_MAX;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(getipl());
+}
+#endif /* __ALPHA_IRQFLAGS_H */
diff --git a/arch/alpha/include/asm/system.h b/arch/alpha/include/asm/system.h
index 5aa40cca4f2..9f78e693463 100644
--- a/arch/alpha/include/asm/system.h
+++ b/arch/alpha/include/asm/system.h
@@ -259,34 +259,6 @@ __CALL_PAL_RW2(wrperfmon, unsigned long, unsigned long, unsigned long);
 __CALL_PAL_W1(wrusp, unsigned long);
 __CALL_PAL_W1(wrvptptr, unsigned long);
-#define IPL_MIN         0
-#define IPL_SW0         1
-#define IPL_SW1         2
-#define IPL_DEV0        3
-#define IPL_DEV1        4
-#define IPL_TIMER       5
-#define IPL_PERF        6
-#define IPL_POWERFAIL   6
-#define IPL_MCHECK      7
-#define IPL_MAX         7
-#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
-#undef IPL_MIN
-#define IPL_MIN         __min_ipl
-extern int __min_ipl;
-#endif
-#define getipl()                (rdps() & 7)
-#define setipl(ipl)             ((void) swpipl(ipl))
-#define local_irq_disable()                     do { setipl(IPL_MAX); barrier(); } while(0)
-#define local_irq_enable()                      do { barrier(); setipl(IPL_MIN); } while(0)
-#define local_save_flags(flags) ((flags) = rdps())
-#define local_irq_save(flags)   do { (flags) = swpipl(IPL_MAX); barrier(); } while(0)
-#define local_irq_restore(flags)        do { barrier(); setipl(flags); barrier(); } while(0)
-#define irqs_disabled() (getipl() == IPL_MAX)
 /*
 * TB routines..
 */
diff --git a/arch/arm/include/asm/irqflags.h b/arch/arm/include/asm/irqflags.h
index 6d09974e664..1e6cca55c75 100644
--- a/arch/arm/include/asm/irqflags.h
+++ b/arch/arm/include/asm/irqflags.h
@@ -10,66 +10,85 @@
 */
 #if __LINUX_ARM_ARCH__ >= 6
-#define raw_local_irq_save(x)                                   \
+static inline unsigned long arch_local_irq_save(void)
-        ({                                                      \
+{
-        __asm__ __volatile__(                                   \
+        unsigned long flags;
-        "mrs    %0, cpsr                @ local_irq_save\n"     \
-        "cpsid  i"                                              \
+        asm volatile(
-        : "=r" (x) : : "memory", "cc");                         \
+                "       mrs     %0, cpsr        @ arch_local_irq_save\n"
-        })
+                "       cpsid   i"
+                : "=r" (flags) : : "memory", "cc");
+        return flags;
+}
+static inline void arch_local_irq_enable(void)
+{
+        asm volatile(
+                "       cpsie i                 @ arch_local_irq_enable"
+                :
+                :
+                : "memory", "cc");
+}
+static inline void arch_local_irq_disable(void)
+{
+        asm volatile(
+                "       cpsid i                 @ arch_local_irq_disable"
+                :
+                :
+                : "memory", "cc");
+}
-#define raw_local_irq_enable()  __asm__("cpsie i        @ __sti" : : : "memory", "cc")
-#define raw_local_irq_disable() __asm__("cpsid i        @ __cli" : : : "memory", "cc")
 #define local_fiq_enable()  __asm__("cpsie f    @ __stf" : : : "memory", "cc")
 #define local_fiq_disable() __asm__("cpsid f    @ __clf" : : : "memory", "cc")
 #else
 /*
 * Save the current interrupt enable state & disable IRQs
 */
-#define raw_local_irq_save(x)                                   \
+static inline unsigned long arch_local_irq_save(void)
-        ({                                                      \
+{
-                unsigned long temp;                             \
+        unsigned long flags, temp;
-                (void) (&temp == &x);                           \
-        __asm__ __volatile__(                                   \
+        asm volatile(
-        "mrs    %0, cpsr                @ local_irq_save\n"     \
+                "       mrs     %0, cpsr        @ arch_local_irq_save\n"
-"       orr     %1, %0, #128\n"                                 \
+                "       orr     %1, %0, #128\n"
-"       msr     cpsr_c, %1"                                     \
+                "       msr     cpsr_c, %1"
-        : "=r" (x), "=r" (temp)                                 \
+                : "=r" (flags), "=r" (temp)
-        :                                                       \
+                :
-        : "memory", "cc");                                      \
+                : "memory", "cc");
-        })
+        return flags;
-        
+}
 /*
 * Enable IRQs
 */
-#define raw_local_irq_enable()                                  \
+static inline void arch_local_irq_enable(void)
-        ({                                                      \
+{
-                unsigned long temp;                             \
+        unsigned long temp;
-        __asm__ __volatile__(                                   \
+        asm volatile(
-        "mrs    %0, cpsr                @ local_irq_enable\n"   \
+                "       mrs     %0, cpsr        @ arch_local_irq_enable\n"
-"       bic     %0, %0, #128\n"                                 \
+                "       bic     %0, %0, #128\n"
-"       msr     cpsr_c, %0"                                     \
+                "       msr     cpsr_c, %0"
-        : "=r" (temp)                                           \
+                : "=r" (temp)
-        :                                                       \
+                :
-        : "memory", "cc");                                      \
+                : "memory", "cc");
-        })
+}
 /*
 * Disable IRQs
 */
-#define raw_local_irq_disable()                                 \
+static inline void arch_local_irq_disable(void)
-        ({                                                      \
+{
-                unsigned long temp;                             \
+        unsigned long temp;
-        __asm__ __volatile__(                                   \
+        asm volatile(
-        "mrs    %0, cpsr                @ local_irq_disable\n"  \
+                "       mrs     %0, cpsr        @ arch_local_irq_disable\n"
-"       orr     %0, %0, #128\n"                                 \
+                "       orr     %0, %0, #128\n"
-"       msr     cpsr_c, %0"                                     \
+                "       msr     cpsr_c, %0"
-        : "=r" (temp)                                           \
+                : "=r" (temp)
-        :                                                       \
+                :
-        : "memory", "cc");                                      \
+                : "memory", "cc");
-        })
+}
 /*
 * Enable FIQs
@@ -106,27 +125,31 @@
 /*
 * Save the current interrupt enable state.
 */
-#define raw_local_save_flags(x)                                 \
+static inline unsigned long arch_local_save_flags(void)
-        ({                                                      \
+{
-        __asm__ __volatile__(                                   \
+        unsigned long flags;
-        "mrs    %0, cpsr                @ local_save_flags"     \
+        asm volatile(
-        : "=r" (x) : : "memory", "cc");                         \
+                "       mrs     %0, cpsr        @ local_save_flags"
-        })
+                : "=r" (flags) : : "memory", "cc");
+        return flags;
+}
 /*
 * restore saved IRQ & FIQ state
 */
-#define raw_local_irq_restore(x)                                \
+static inline void arch_local_irq_restore(unsigned long flags)
-        __asm__ __volatile__(                                   \
+{
-        "msr    cpsr_c, %0              @ local_irq_restore\n"  \
+        asm volatile(
-        :                                                       \
+                "       msr     cpsr_c, %0      @ local_irq_restore"
-        : "r" (x)                                               \
+                :
-        : "memory", "cc")
+                : "r" (flags)
+                : "memory", "cc");
+}
-#define raw_irqs_disabled_flags(flags)  \
+static inline int arch_irqs_disabled_flags(unsigned long flags)
-({                                      \
+{
-        (int)((flags) & PSR_I_BIT);     \
+        return flags & PSR_I_BIT;
-})
+}
 #endif
 #endif
diff --git a/arch/avr32/include/asm/irqflags.h b/arch/avr32/include/asm/irqflags.h
index 93570daac38..006e9487372 100644
--- a/arch/avr32/include/asm/irqflags.h
+++ b/arch/avr32/include/asm/irqflags.h
@@ -8,16 +8,14 @@
 #ifndef __ASM_AVR32_IRQFLAGS_H
 #define __ASM_AVR32_IRQFLAGS_H
+#include <linux/types.h>
 #include <asm/sysreg.h>
-static inline unsigned long __raw_local_save_flags(void)
+static inline unsigned long arch_local_save_flags(void)
 {
        return sysreg_read(SR);
 }
-#define raw_local_save_flags(x)                                 \
-        do { (x) = __raw_local_save_flags(); } while (0)
 /*
 * This will restore ALL status register flags, not only the interrupt
 * mask flag.
@@ -25,44 +23,39 @@ static inline unsigned long __raw_local_save_flags(void)
 * The empty asm statement informs the compiler of this fact while
 * also serving as a barrier.
 */
-static inline void raw_local_irq_restore(unsigned long flags)
+static inline void arch_local_irq_restore(unsigned long flags)
 {
        sysreg_write(SR, flags);
        asm volatile("" : : : "memory", "cc");
 }
-static inline void raw_local_irq_disable(void)
+static inline void arch_local_irq_disable(void)
 {
        asm volatile("ssrf %0" : : "n"(SYSREG_GM_OFFSET) : "memory");
 }
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_enable(void)
 {
        asm volatile("csrf %0" : : "n"(SYSREG_GM_OFFSET) : "memory");
 }
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
 {
        return (flags & SYSREG_BIT(GM)) != 0;
 }
-static inline int raw_irqs_disabled(void)
+static inline bool arch_irqs_disabled(void)
 {
-        unsigned long flags = __raw_local_save_flags();
+        return arch_irqs_disabled_flags(arch_local_save_flags());
-        return raw_irqs_disabled_flags(flags);
 }
-static inline unsigned long __raw_local_irq_save(void)
+static inline unsigned long arch_local_irq_save(void)
 {
-        unsigned long flags = __raw_local_save_flags();
+        unsigned long flags = arch_local_save_flags();
-        raw_local_irq_disable();
+        arch_local_irq_disable();
        return flags;
 }
-#define raw_local_irq_save(flags)                               \
-        do { (flags) = __raw_local_irq_save(); } while (0)
 #endif /* __ASM_AVR32_IRQFLAGS_H */
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h
index d3b40449ca0..40f94a704c0 100644
--- a/arch/blackfin/include/asm/ipipe.h
+++ b/arch/blackfin/include/asm/ipipe.h
@@ -49,7 +49,7 @@
 #define prepare_arch_switch(next)               \
 do {                                            \
        ipipe_schedule_notify(current, next);   \
-        local_irq_disable_hw();                 \
+        hard_local_irq_disable();                       \
 } while (0)
 #define task_hijacked(p)                                                \
@@ -57,7 +57,7 @@ do {						\
                int __x__ = __ipipe_root_domain_p;                      \
                __clear_bit(IPIPE_SYNC_FLAG, &ipipe_root_cpudom_var(status)); \
                if (__x__)                                              \
-                        local_irq_enable_hw();                          \
+                        hard_local_irq_enable();                                \
                !__x__;                                                 \
        })
@@ -167,7 +167,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul)
 #define __ipipe_run_isr(ipd, irq)                                       \
        do {                                                            \
                if (!__ipipe_pipeline_head_p(ipd))                      \
-                        local_irq_enable_hw();                          \
+                        hard_local_irq_enable();                                \
                if (ipd == ipipe_root_domain) {                         \
                        if (unlikely(ipipe_virtual_irq_p(irq))) {       \
                                irq_enter();                            \
@@ -183,7 +183,7 @@ static inline unsigned long __ipipe_ffnz(unsigned long ul)
                        __ipipe_run_irqtail();                          \
                        __set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \
                }                                                       \
-                local_irq_disable_hw();                                 \
+                hard_local_irq_disable();                                       \
        } while (0)
 #define __ipipe_syscall_watched_p(p, sc)        \
diff --git a/arch/blackfin/include/asm/irqflags.h b/arch/blackfin/include/asm/irqflags.h
index 813a1af3e86..41c4d70544e 100644
--- a/arch/blackfin/include/asm/irqflags.h
+++ b/arch/blackfin/include/asm/irqflags.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_BFIN_IRQFLAGS_H__
 #define __ASM_BFIN_IRQFLAGS_H__
+#include <mach/blackfin.h>
 #ifdef CONFIG_SMP
 # include <asm/pda.h>
 # include <asm/processor.h>
@@ -31,54 +33,108 @@ static inline unsigned long bfin_cli(void)
        return flags;
 }
-#ifdef CONFIG_IPIPE
-#include <linux/compiler.h>
-#include <linux/ipipe_base.h>
-#include <linux/ipipe_trace.h>
 #ifdef CONFIG_DEBUG_HWERR
 # define bfin_no_irqs 0x3f
 #else
 # define bfin_no_irqs 0x1f
 #endif
-#define raw_local_irq_disable()                         \
+/*****************************************************************************/
-        do {                                            \
+/*
-                ipipe_check_context(ipipe_root_domain); \
+ * Hard, untraced CPU interrupt flag manipulation and access.
-                __ipipe_stall_root();                   \
+ */
-                barrier();                              \
+static inline void __hard_local_irq_disable(void)
-        } while (0)
+{
+        bfin_cli();
+}
+static inline void __hard_local_irq_enable(void)
+{
+        bfin_sti(bfin_irq_flags);
+}
+static inline unsigned long hard_local_save_flags(void)
+{
+        return bfin_read_IMASK();
+}
-#define raw_local_irq_enable()                          \
+static inline unsigned long __hard_local_irq_save(void)
-        do {                                            \
+{
-                barrier();                              \
+        unsigned long flags;
-                ipipe_check_context(ipipe_root_domain); \
+        flags = bfin_cli();
-                __ipipe_unstall_root();                 \
+#ifdef CONFIG_DEBUG_HWERR
-        } while (0)
+        bfin_sti(0x3f);
+#endif
+        return flags;
+}
+static inline int hard_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & ~0x3f) == 0;
+}
+static inline int hard_irqs_disabled(void)
+{
+        unsigned long flags = hard_local_save_flags();
+        return hard_irqs_disabled_flags(flags);
+}
+static inline void __hard_local_irq_restore(unsigned long flags)
+{
+        if (!hard_irqs_disabled_flags(flags))
+                __hard_local_irq_enable();
+}
+/*****************************************************************************/
+/*
+ * Interrupt pipe handling.
+ */
+#ifdef CONFIG_IPIPE
+#include <linux/compiler.h>
+#include <linux/ipipe_base.h>
+#include <linux/ipipe_trace.h>
+/*
+ * Interrupt pipe interface to linux/irqflags.h.
+ */
+static inline void arch_local_irq_disable(void)
+{
+        ipipe_check_context(ipipe_root_domain);
+        __ipipe_stall_root();
+        barrier();
+}
-#define raw_local_save_flags_ptr(x)                                     \
+static inline void arch_local_irq_enable(void)
-        do {                                                            \
+{
-                *(x) = __ipipe_test_root() ? bfin_no_irqs : bfin_irq_flags; \
+        barrier();
-        } while (0)
+        ipipe_check_context(ipipe_root_domain);
+        __ipipe_unstall_root();
+}
-#define raw_local_save_flags(x)         raw_local_save_flags_ptr(&(x))
+static inline unsigned long arch_local_save_flags(void)
+{
+        return __ipipe_test_root() ? bfin_no_irqs : bfin_irq_flags;
+}
-#define raw_irqs_disabled_flags(x)      ((x) == bfin_no_irqs)
+static inline int arch_irqs_disabled_flags(unsigned long flags)
+{
+        return flags == bfin_no_irqs;
+}
-#define raw_local_irq_save_ptr(x)                                       \
+static inline void arch_local_irq_save_ptr(unsigned long *_flags)
-        do {                                                            \
+{
-                *(x) = __ipipe_test_and_stall_root() ? bfin_no_irqs : bfin_irq_flags; \
+        x = __ipipe_test_and_stall_root() ? bfin_no_irqs : bfin_irq_flags;
-                barrier();                                              \
+        barrier();
-        } while (0)
+}
-#define raw_local_irq_save(x)                           \
+static inline unsigned long arch_local_irq_save(void)
-        do {                                            \
+{
-                ipipe_check_context(ipipe_root_domain); \
+        ipipe_check_context(ipipe_root_domain);
-                raw_local_irq_save_ptr(&(x));           \
+        return __hard_local_irq_save();
-        } while (0)
+}
-static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real)
+static inline unsigned long arch_mangle_irq_bits(int virt, unsigned long real)
 {
        /*
         * Merge virtual and real interrupt mask bits into a single
@@ -87,130 +143,79 @@ static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real)
        return (real & ~(1 << 31)) | ((virt != 0) << 31);
 }
-static inline int raw_demangle_irq_bits(unsigned long *x)
+static inline int arch_demangle_irq_bits(unsigned long *x)
 {
        int virt = (*x & (1 << 31)) != 0;
        *x &= ~(1L << 31);
        return virt;
 }
-static inline void local_irq_disable_hw_notrace(void)
+/*
+ * Interface to various arch routines that may be traced.
+ */
+#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
+static inline void hard_local_irq_disable(void)
 {
-        bfin_cli();
+        if (!hard_irqs_disabled()) {
+                __hard_local_irq_disable();
+                ipipe_trace_begin(0x80000000);
+        }
 }
-static inline void local_irq_enable_hw_notrace(void)
+static inline void hard_local_irq_enable(void)
 {
-        bfin_sti(bfin_irq_flags);
+        if (hard_irqs_disabled()) {
+                ipipe_trace_end(0x80000000);
+                __hard_local_irq_enable();
+        }
 }
-#define local_save_flags_hw(flags)                      \
+static inline unsigned long hard_local_irq_save(void)
-        do {                                            \
-                (flags) = bfin_read_IMASK();            \
-        } while (0)
-#define irqs_disabled_flags_hw(flags) (((flags) & ~0x3f) == 0)
-#define irqs_disabled_hw()                      \
-        ({                                      \
-        unsigned long flags;                    \
-        local_save_flags_hw(flags);             \
-        irqs_disabled_flags_hw(flags);          \
-        })
-static inline void local_irq_save_ptr_hw(unsigned long *flags)
 {
-        *flags = bfin_cli();
+        unsigned long flags = hard_local_save_flags();
-#ifdef CONFIG_DEBUG_HWERR
+        if (!hard_irqs_disabled_flags(flags)) {
-        bfin_sti(0x3f);
+                __hard_local_irq_disable();
-#endif
+                ipipe_trace_begin(0x80000001);
+        }
+        return flags;
 }
-#define local_irq_save_hw_notrace(flags)                \
+static inline void hard_local_irq_restore(unsigned long flags)
-        do {                                            \
-                local_irq_save_ptr_hw(&(flags));        \
-        } while (0)
-static inline void local_irq_restore_hw_notrace(unsigned long flags)
 {
-        if (!irqs_disabled_flags_hw(flags))
+        if (!hard_irqs_disabled_flags(flags)) {
-                local_irq_enable_hw_notrace();
+                ipipe_trace_end(0x80000001);
+                __hard_local_irq_enable();
+        }
 }
-#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
-# define local_irq_disable_hw()                         \
-        do {                                            \
-                if (!irqs_disabled_hw()) {              \
-                        local_irq_disable_hw_notrace(); \
-                        ipipe_trace_begin(0x80000000);  \
-                }                                       \
-        } while (0)
-# define local_irq_enable_hw()                          \
-        do {                                            \
-                if (irqs_disabled_hw()) {               \
-                        ipipe_trace_end(0x80000000);    \
-                        local_irq_enable_hw_notrace();  \
-                }                                       \
-        } while (0)
-# define local_irq_save_hw(flags)                       \
-        do {                                            \
-                local_save_flags_hw(flags);             \
-                if (!irqs_disabled_flags_hw(flags)) {   \
-                        local_irq_disable_hw_notrace(); \
-                        ipipe_trace_begin(0x80000001);  \
-                }                                       \
-        } while (0)
-# define local_irq_restore_hw(flags)                    \
-        do {                                            \
-                if (!irqs_disabled_flags_hw(flags)) {   \
-                        ipipe_trace_end(0x80000001);    \
-                        local_irq_enable_hw_notrace();  \
-                }                                       \
-        } while (0)
 #else /* !CONFIG_IPIPE_TRACE_IRQSOFF */
-# define local_irq_disable_hw()         local_irq_disable_hw_notrace()
+# define hard_local_irq_disable()       __hard_local_irq_disable()
-# define local_irq_enable_hw()          local_irq_enable_hw_notrace()
+# define hard_local_irq_enable()        __hard_local_irq_enable()
-# define local_irq_save_hw(flags)       local_irq_save_hw_notrace(flags)
+# define hard_local_irq_save()          __hard_local_irq_save()
-# define local_irq_restore_hw(flags)    local_irq_restore_hw_notrace(flags)
+# define hard_local_irq_restore(flags)  __hard_local_irq_restore(flags)
 #endif /* !CONFIG_IPIPE_TRACE_IRQSOFF */
 #else /* CONFIG_IPIPE */
-static inline void raw_local_irq_disable(void)
+/*
-{
+ * Direct interface to linux/irqflags.h.
-        bfin_cli();
+ */
-}
+#define arch_local_save_flags()         hard_local_save_flags()
-static inline void raw_local_irq_enable(void)
+#define arch_local_irq_save(flags)      __hard_local_irq_save()
-{
+#define arch_local_irq_restore(flags)   __hard_local_irq_restore(flags)
-        bfin_sti(bfin_irq_flags);
+#define arch_local_irq_enable()         __hard_local_irq_enable()
-}
+#define arch_local_irq_disable()        __hard_local_irq_disable()
+#define arch_irqs_disabled_flags(flags) hard_irqs_disabled_flags(flags)
-#define raw_local_save_flags(flags) do { (flags) = bfin_read_IMASK(); } while (0)
+#define arch_irqs_disabled()            hard_irqs_disabled()
-#define raw_irqs_disabled_flags(flags) (((flags) & ~0x3f) == 0)
-static inline unsigned long __raw_local_irq_save(void)
+/*
-{
+ * Interface to various arch routines that may be traced.
-        unsigned long flags = bfin_cli();
+ */
-#ifdef CONFIG_DEBUG_HWERR
+#define hard_local_irq_save()           __hard_local_irq_save()
-        bfin_sti(0x3f);
+#define hard_local_irq_restore(flags)   __hard_local_irq_restore(flags)
-#endif
+#define hard_local_irq_enable()         __hard_local_irq_enable()
-        return flags;
+#define hard_local_irq_disable()        __hard_local_irq_disable()
-}
-#define raw_local_irq_save(flags) do { (flags) = __raw_local_irq_save(); } while (0)
-#define local_irq_save_hw(flags)        raw_local_irq_save(flags)
-#define local_irq_restore_hw(flags)     raw_local_irq_restore(flags)
-#define local_irq_enable_hw()           raw_local_irq_enable()
-#define local_irq_disable_hw()          raw_local_irq_disable()
-#define irqs_disabled_hw()              irqs_disabled()
 #endif /* !CONFIG_IPIPE */
-static inline void raw_local_irq_restore(unsigned long flags)
-{
-        if (!raw_irqs_disabled_flags(flags))
-                raw_local_irq_enable();
-}
 #endif
diff --git a/arch/blackfin/include/asm/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h
index e1a9b4624f9..3828c70e7a2 100644
--- a/arch/blackfin/include/asm/mmu_context.h
+++ b/arch/blackfin/include/asm/mmu_context.h
@@ -97,8 +97,8 @@ static inline void __switch_mm(struct mm_struct *prev_mm, struct mm_struct *next
 }
 #ifdef CONFIG_IPIPE
-#define lock_mm_switch(flags)   local_irq_save_hw_cond(flags)
+#define lock_mm_switch(flags)   flags = hard_local_irq_save_cond()
-#define unlock_mm_switch(flags) local_irq_restore_hw_cond(flags)
+#define unlock_mm_switch(flags) hard_local_irq_restore_cond(flags)
 #else
 #define lock_mm_switch(flags)   do { (void)(flags); } while (0)
 #define unlock_mm_switch(flags) do { (void)(flags); } while (0)
@@ -205,9 +205,9 @@ static inline void destroy_context(struct mm_struct *mm)
 }
 #define ipipe_mm_switch_protect(flags)          \
-        local_irq_save_hw_cond(flags)
+        flags = hard_local_irq_save_cond()
 #define ipipe_mm_switch_unprotect(flags)        \
-        local_irq_restore_hw_cond(flags)
+        hard_local_irq_restore_cond(flags)
 #endif
diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h
index dde19b1d25f..19e2c7c3e63 100644
--- a/arch/blackfin/include/asm/system.h
+++ b/arch/blackfin/include/asm/system.h
@@ -117,7 +117,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
        unsigned long tmp = 0;
        unsigned long flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        switch (size) {
        case 1:
@@ -139,7 +139,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
                         : "=&d" (tmp) : "d" (x), "m" (*__xg(ptr)) : "memory");
                break;
        }
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return tmp;
 }
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index dc07ed08b37..ca1c1f9debd 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -349,13 +349,13 @@ inline void portmux_setup(unsigned short per)
 void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
 { \
        unsigned long flags; \
-        local_irq_save_hw(flags); \
+        flags = hard_local_irq_save(); \
        if (arg) \
                gpio_array[gpio_bank(gpio)]->name |= gpio_bit(gpio); \
        else \
                gpio_array[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \
        AWA_DUMMY_READ(name); \
-        local_irq_restore_hw(flags); \
+        hard_local_irq_restore(flags); \
 } \
 EXPORT_SYMBOL(set_gpio_ ## name);
@@ -371,14 +371,14 @@ void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
 { \
        unsigned long flags; \
        if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
        if (arg) \
                gpio_array[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
        else \
                gpio_array[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \
        if (ANOMALY_05000311 || ANOMALY_05000323) { \
                AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
        } \
 } \
 EXPORT_SYMBOL(set_gpio_ ## name);
@@ -391,11 +391,11 @@ void set_gpio_toggle(unsigned gpio)
 {
        unsigned long flags;
        if (ANOMALY_05000311 || ANOMALY_05000323)
-                local_irq_save_hw(flags);
+                flags = hard_local_irq_save();
        gpio_array[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
        if (ANOMALY_05000311 || ANOMALY_05000323) {
                AWA_DUMMY_READ(toggle);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
        }
 }
 EXPORT_SYMBOL(set_gpio_toggle);
@@ -408,11 +408,11 @@ void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \
 { \
        unsigned long flags; \
        if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
        gpio_array[gpio_bank(gpio)]->name = arg; \
        if (ANOMALY_05000311 || ANOMALY_05000323) { \
                AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
        } \
 } \
 EXPORT_SYMBOL(set_gpiop_ ## name);
@@ -433,11 +433,11 @@ unsigned short get_gpio_ ## name(unsigned gpio) \
        unsigned long flags; \
        unsigned short ret; \
        if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
        ret = 0x01 & (gpio_array[gpio_bank(gpio)]->name >> gpio_sub_n(gpio)); \
        if (ANOMALY_05000311 || ANOMALY_05000323) { \
                AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
        } \
        return ret; \
 } \
@@ -460,11 +460,11 @@ unsigned short get_gpiop_ ## name(unsigned gpio) \
        unsigned long flags; \
        unsigned short ret; \
        if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
        ret = (gpio_array[gpio_bank(gpio)]->name); \
        if (ANOMALY_05000311 || ANOMALY_05000323) { \
                AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
        } \
        return ret; \
 } \
@@ -525,14 +525,14 @@ int gpio_pm_wakeup_ctrl(unsigned gpio, unsigned ctrl)
        if (check_gpio(gpio) < 0)
                return -EINVAL;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (ctrl)
                reserve(wakeup, gpio);
        else
                unreserve(wakeup, gpio);
        set_gpio_maskb(gpio, ctrl);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return 0;
 }
@@ -690,7 +690,7 @@ int peripheral_request(unsigned short per, const char *label)
        BUG_ON(ident >= MAX_RESOURCES);
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        /* If a pin can be muxed as either GPIO or peripheral, make
         * sure it is not already a GPIO pin when we request it.
@@ -701,7 +701,7 @@ int peripheral_request(unsigned short per, const char *label)
                printk(KERN_ERR
                       "%s: Peripheral %d is already reserved as GPIO by %s !\n",
                       __func__, ident, get_label(ident));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return -EBUSY;
        }
@@ -730,7 +730,7 @@ int peripheral_request(unsigned short per, const char *label)
                        printk(KERN_ERR
                               "%s: Peripheral %d function %d is already reserved by %s !\n",
                               __func__, ident, P_FUNCT2MUX(per), get_label(ident));
-                        local_irq_restore_hw(flags);
+                        hard_local_irq_restore(flags);
                        return -EBUSY;
                }
        }
@@ -741,7 +741,7 @@ int peripheral_request(unsigned short per, const char *label)
        portmux_setup(per);
        port_setup(ident, PERIPHERAL_USAGE);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        set_label(ident, label);
        return 0;
@@ -780,10 +780,10 @@ void peripheral_free(unsigned short per)
        if (!(per & P_DEFINED))
                return;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (unlikely(!is_reserved(peri, ident, 0))) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return;
        }
@@ -794,7 +794,7 @@ void peripheral_free(unsigned short per)
        set_label(ident, "free");
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(peripheral_free);
@@ -828,7 +828,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
        if (check_gpio(gpio) < 0)
                return -EINVAL;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        /*
         * Allow that the identical GPIO can
@@ -837,7 +837,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
         */
        if (cmp_label(gpio, label) == 0) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return 0;
        }
@@ -846,7 +846,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
                        dump_stack();
                printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
                       gpio, get_label(gpio));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return -EBUSY;
        }
        if (unlikely(is_reserved(peri, gpio, 1))) {
@@ -855,7 +855,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
                printk(KERN_ERR
                       "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
                       gpio, get_label(gpio));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return -EBUSY;
        }
        if (unlikely(is_reserved(gpio_irq, gpio, 1))) {
@@ -871,7 +871,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
        reserve(gpio, gpio);
        set_label(gpio, label);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        port_setup(gpio, GPIO_USAGE);
@@ -888,13 +888,13 @@ void bfin_gpio_free(unsigned gpio)
        might_sleep();
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (unlikely(!is_reserved(gpio, gpio, 0))) {
                if (system_state == SYSTEM_BOOTING)
                        dump_stack();
                gpio_error(gpio);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return;
        }
@@ -902,7 +902,7 @@ void bfin_gpio_free(unsigned gpio)
        set_label(gpio, "free");
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(bfin_gpio_free);
@@ -913,7 +913,7 @@ int bfin_special_gpio_request(unsigned gpio, const char *label)
 {
        unsigned long flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        /*
         * Allow that the identical GPIO can
@@ -922,19 +922,19 @@ int bfin_special_gpio_request(unsigned gpio, const char *label)
         */
        if (cmp_label(gpio, label) == 0) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return 0;
        }
        if (unlikely(is_reserved(special_gpio, gpio, 1))) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
                       gpio, get_label(gpio));
                return -EBUSY;
        }
        if (unlikely(is_reserved(peri, gpio, 1))) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                printk(KERN_ERR
                       "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
                       gpio, get_label(gpio));
@@ -946,7 +946,7 @@ int bfin_special_gpio_request(unsigned gpio, const char *label)
        reserve(peri, gpio);
        set_label(gpio, label);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        port_setup(gpio, GPIO_USAGE);
        return 0;
@@ -959,18 +959,18 @@ void bfin_special_gpio_free(unsigned gpio)
        might_sleep();
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (unlikely(!is_reserved(special_gpio, gpio, 0))) {
                gpio_error(gpio);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return;
        }
        unreserve(special_gpio, gpio);
        unreserve(peri, gpio);
        set_label(gpio, "free");
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(bfin_special_gpio_free);
 #endif
@@ -983,7 +983,7 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
        if (check_gpio(gpio) < 0)
                return -EINVAL;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (unlikely(is_reserved(peri, gpio, 1))) {
                if (system_state == SYSTEM_BOOTING)
@@ -991,7 +991,7 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
                printk(KERN_ERR
                       "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
                       gpio, get_label(gpio));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return -EBUSY;
        }
        if (unlikely(is_reserved(gpio, gpio, 1)))
@@ -1002,7 +1002,7 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
        reserve(gpio_irq, gpio);
        set_label(gpio, label);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        port_setup(gpio, GPIO_USAGE);
@@ -1016,13 +1016,13 @@ void bfin_gpio_irq_free(unsigned gpio)
        if (check_gpio(gpio) < 0)
                return;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (unlikely(!is_reserved(gpio_irq, gpio, 0))) {
                if (system_state == SYSTEM_BOOTING)
                        dump_stack();
                gpio_error(gpio);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return;
        }
@@ -1030,7 +1030,7 @@ void bfin_gpio_irq_free(unsigned gpio)
        set_label(gpio, "free");
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 static inline void __bfin_gpio_direction_input(unsigned gpio)
@@ -1052,10 +1052,10 @@ int bfin_gpio_direction_input(unsigned gpio)
                return -EINVAL;
        }
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        __bfin_gpio_direction_input(gpio);
        AWA_DUMMY_READ(inen);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return 0;
 }
@@ -1070,9 +1070,9 @@ void bfin_gpio_irq_prepare(unsigned gpio)
        port_setup(gpio, GPIO_USAGE);
 #ifdef CONFIG_BF54x
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        __bfin_gpio_direction_input(gpio);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 #endif
 }
@@ -1094,7 +1094,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
                return -EINVAL;
        }
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
        gpio_set_value(gpio, value);
@@ -1105,7 +1105,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
 #endif
        AWA_DUMMY_READ(dir);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return 0;
 }
@@ -1120,11 +1120,11 @@ int bfin_gpio_get_value(unsigned gpio)
        if (unlikely(get_gpio_edge(gpio))) {
                int ret;
-                local_irq_save_hw(flags);
+                flags = hard_local_irq_save();
                set_gpio_edge(gpio, 0);
                ret = get_gpio_data(gpio);
                set_gpio_edge(gpio, 1);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return ret;
        } else
                return get_gpio_data(gpio);
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index 87b25b1b30e..8de92299b3e 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -318,7 +318,7 @@ void flush_switched_cplbs(unsigned int cpu)
        nr_cplb_flush[cpu]++;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        _disable_icplb();
        for (i = first_switched_icplb; i < MAX_CPLBS; i++) {
                icplb_tbl[cpu][i].data = 0;
@@ -332,7 +332,7 @@ void flush_switched_cplbs(unsigned int cpu)
                bfin_write32(DCPLB_DATA0 + i * 4, 0);
        }
        _enable_dcplb();
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
@@ -348,7 +348,7 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
                return;
        }
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        current_rwx_mask[cpu] = masks;
        if (L2_LENGTH && addr >= L2_START && addr < L2_START + L2_LENGTH) {
@@ -373,5 +373,5 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
                addr += PAGE_SIZE;
        }
        _enable_dcplb();
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index 1a496cd71ba..3b1da4aff2a 100644
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -219,10 +219,10 @@ int __ipipe_syscall_root(struct pt_regs *regs)
        ret = __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs);
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (!__ipipe_root_domain_p) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                return 1;
        }
@@ -230,7 +230,7 @@ int __ipipe_syscall_root(struct pt_regs *regs)
        if ((p->irqpend_himask & IPIPE_IRQMASK_VIRT) != 0)
                __ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return -ret;
 }
@@ -239,14 +239,14 @@ unsigned long ipipe_critical_enter(void (*syncfn) (void))
 {
        unsigned long flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        return flags;
 }
 void ipipe_critical_exit(unsigned long flags)
 {
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 static void __ipipe_no_irqtail(void)
@@ -279,9 +279,9 @@ int ipipe_trigger_irq(unsigned irq)
                return -EINVAL;
 #endif
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        __ipipe_handle_irq(irq, NULL);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return 1;
 }
@@ -293,7 +293,7 @@ asmlinkage void __ipipe_sync_root(void)
        BUG_ON(irqs_disabled());
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (irq_tail_hook)
                irq_tail_hook();
@@ -303,7 +303,7 @@ asmlinkage void __ipipe_sync_root(void)
        if (ipipe_root_cpudom_var(irqpend_himask) != 0)
                __ipipe_sync_pipeline(IPIPE_IRQMASK_ANY);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 void ___ipipe_sync_pipeline(unsigned long syncmask)
@@ -344,10 +344,10 @@ void __ipipe_stall_root(void)
 {
        unsigned long *p, flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        __set_bit(IPIPE_STALL_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_stall_root);
@@ -356,10 +356,10 @@ unsigned long __ipipe_test_and_stall_root(void)
        unsigned long *p, flags;
        int x;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        x = __test_and_set_bit(IPIPE_STALL_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return x;
 }
@@ -371,10 +371,10 @@ unsigned long __ipipe_test_root(void)
        unsigned long flags;
        int x;
-        local_irq_save_hw_smp(flags);
+        flags = hard_local_irq_save_smp();
        p = &__ipipe_root_status;
        x = test_bit(IPIPE_STALL_FLAG, p);
-        local_irq_restore_hw_smp(flags);
+        hard_local_irq_restore_smp(flags);
        return x;
 }
@@ -384,10 +384,10 @@ void __ipipe_lock_root(void)
 {
        unsigned long *p, flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        __set_bit(IPIPE_SYNCDEFER_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_lock_root);
@@ -395,9 +395,9 @@ void __ipipe_unlock_root(void)
 {
        unsigned long *p, flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        p = &__ipipe_root_status;
        __clear_bit(IPIPE_SYNCDEFER_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_unlock_root);
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 01f98cb964d..c86a3ed5f48 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -65,11 +65,11 @@ static void default_idle(void)
 #ifdef CONFIG_IPIPE
        ipipe_suspend_domain();
 #endif
-        local_irq_disable_hw();
+        hard_local_irq_disable();
        if (!need_resched())
                idle_with_irq_disabled();
-        local_irq_enable_hw();
+        hard_local_irq_enable();
 }
 /*
diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c
index 59fcdf6b013..05b550891ce 100644
--- a/arch/blackfin/kernel/trace.c
+++ b/arch/blackfin/kernel/trace.c
@@ -15,6 +15,7 @@
 #include <linux/kallsyms.h>
 #include <linux/err.h>
 #include <linux/fs.h>
+#include <linux/irq.h>
 #include <asm/dma.h>
 #include <asm/trace.h>
 #include <asm/fixed_code.h>
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h b/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
index e548e9d1d6f..29498e59e71 100644
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h
@@ -1058,54 +1058,4 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
 #endif /* _CDEF_BF52X_H */
diff --git a/arch/blackfin/mach-bf518/include/mach/pll.h b/arch/blackfin/mach-bf518/include/mach/pll.h
new file mode 100644
index 00000000000..d5502988896
--- /dev/null
+++ b/arch/blackfin/mach-bf518/include/mach/pll.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
index 12f2ad45314..11fb27bc427 100644
--- a/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
+++ b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h
@@ -1110,54 +1110,4 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
 #endif /* _CDEF_BF52X_H */
diff --git a/arch/blackfin/mach-bf527/include/mach/pll.h b/arch/blackfin/mach-bf527/include/mach/pll.h
new file mode 100644
index 00000000000..24f1d7c0232
--- /dev/null
+++ b/arch/blackfin/mach-bf527/include/mach/pll.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2007-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c
index 842b4fa76ea..84a06f677df 100644
--- a/arch/blackfin/mach-bf533/boards/blackstamp.c
+++ b/arch/blackfin/mach-bf533/boards/blackstamp.c
@@ -25,6 +25,7 @@
 #include <asm/bfin5xx_spi.h>
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
+#include <mach/fio_flag.h>
 /*
 * Name the Board for the /proc/cpuinfo
diff --git a/arch/blackfin/mach-bf533/boards/ip0x.c b/arch/blackfin/mach-bf533/boards/ip0x.c
index 7349970db97..b8474cac6b0 100644
--- a/arch/blackfin/mach-bf533/boards/ip0x.c
+++ b/arch/blackfin/mach-bf533/boards/ip0x.c
@@ -22,6 +22,7 @@
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/portmux.h>
+#include <mach/fio_flag.h>
 /*
 * Name the Board for the /proc/cpuinfo
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index c457eaa6023..29c219eff2f 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -24,6 +24,7 @@
 #include <asm/reboot.h>
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
+#include <mach/fio_flag.h>
 /*
 * Name the Board for the /proc/cpuinfo
diff --git a/arch/blackfin/mach-bf533/include/mach/cdefBF532.h b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h
index feb2392c43e..401e524f532 100644
--- a/arch/blackfin/mach-bf533/include/mach/cdefBF532.h
+++ b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h
@@ -7,11 +7,6 @@
 #ifndef _CDEF_BF532_H
 #define _CDEF_BF532_H
-#include <asm/blackfin.h>
-/*include all Core registers and bit definitions*/
-#include "defBF532.h"
 /*include core specific register pointer definitions*/
 #include <asm/cdef_LPBlackfin.h>
@@ -655,90 +650,4 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-#if ANOMALY_05000311
-#define BFIN_WRITE_FIO_FLAG(name) \
-static inline void bfin_write_FIO_FLAG_##name(unsigned short val) \
-{ \
-        unsigned long flags; \
-        local_irq_save_hw(flags); \
-        bfin_write16(FIO_FLAG_##name, val); \
-        bfin_read_CHIPID(); \
-        local_irq_restore_hw(flags); \
-}
-BFIN_WRITE_FIO_FLAG(D)
-BFIN_WRITE_FIO_FLAG(C)
-BFIN_WRITE_FIO_FLAG(S)
-BFIN_WRITE_FIO_FLAG(T)
-#define BFIN_READ_FIO_FLAG(name) \
-static inline u16 bfin_read_FIO_FLAG_##name(void) \
-{ \
-        unsigned long flags; \
-        u16 ret; \
-        local_irq_save_hw(flags); \
-        ret = bfin_read16(FIO_FLAG_##name); \
-        bfin_read_CHIPID(); \
-        local_irq_restore_hw(flags); \
-        return ret; \
-}
-BFIN_READ_FIO_FLAG(D)
-BFIN_READ_FIO_FLAG(C)
-BFIN_READ_FIO_FLAG(S)
-BFIN_READ_FIO_FLAG(T)
-#else
-#define bfin_write_FIO_FLAG_D(val)           bfin_write16(FIO_FLAG_D, val)
-#define bfin_write_FIO_FLAG_C(val)           bfin_write16(FIO_FLAG_C, val)
-#define bfin_write_FIO_FLAG_S(val)           bfin_write16(FIO_FLAG_S, val)
-#define bfin_write_FIO_FLAG_T(val)           bfin_write16(FIO_FLAG_T, val)
-#define bfin_read_FIO_FLAG_T()               bfin_read16(FIO_FLAG_T)
-#define bfin_read_FIO_FLAG_C()               bfin_read16(FIO_FLAG_C)
-#define bfin_read_FIO_FLAG_S()               bfin_read16(FIO_FLAG_S)
-#define bfin_read_FIO_FLAG_D()               bfin_read16(FIO_FLAG_D)
-#endif
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr = bfin_read32(SIC_IWR);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR, IWR_ENABLE(0));
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR, iwr);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr = bfin_read32(SIC_IWR);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR, IWR_ENABLE(0));
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR, iwr);
-        local_irq_restore_hw(flags);
-}
 #endif                          /* _CDEF_BF532_H */
diff --git a/arch/blackfin/mach-bf533/include/mach/fio_flag.h b/arch/blackfin/mach-bf533/include/mach/fio_flag.h
new file mode 100644
index 00000000000..d0bfba0b083
--- /dev/null
+++ b/arch/blackfin/mach-bf533/include/mach/fio_flag.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+#ifndef _MACH_FIO_FLAG_H
+#define _MACH_FIO_FLAG_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+#if ANOMALY_05000311
+#define BFIN_WRITE_FIO_FLAG(name) \
+static inline void bfin_write_FIO_FLAG_##name(unsigned short val) \
+{ \
+        unsigned long flags; \
+        flags = hard_local_irq_save(); \
+        bfin_write16(FIO_FLAG_##name, val); \
+        bfin_read_CHIPID(); \
+        hard_local_irq_restore(flags); \
+}
+BFIN_WRITE_FIO_FLAG(D)
+BFIN_WRITE_FIO_FLAG(C)
+BFIN_WRITE_FIO_FLAG(S)
+BFIN_WRITE_FIO_FLAG(T)
+#define BFIN_READ_FIO_FLAG(name) \
+static inline u16 bfin_read_FIO_FLAG_##name(void) \
+{ \
+        unsigned long flags; \
+        u16 ret; \
+        flags = hard_local_irq_save(); \
+        ret = bfin_read16(FIO_FLAG_##name); \
+        bfin_read_CHIPID(); \
+        hard_local_irq_restore(flags); \
+        return ret; \
+}
+BFIN_READ_FIO_FLAG(D)
+BFIN_READ_FIO_FLAG(C)
+BFIN_READ_FIO_FLAG(S)
+BFIN_READ_FIO_FLAG(T)
+#else
+#define bfin_write_FIO_FLAG_D(val)           bfin_write16(FIO_FLAG_D, val)
+#define bfin_write_FIO_FLAG_C(val)           bfin_write16(FIO_FLAG_C, val)
+#define bfin_write_FIO_FLAG_S(val)           bfin_write16(FIO_FLAG_S, val)
+#define bfin_write_FIO_FLAG_T(val)           bfin_write16(FIO_FLAG_T, val)
+#define bfin_read_FIO_FLAG_T()               bfin_read16(FIO_FLAG_T)
+#define bfin_read_FIO_FLAG_C()               bfin_read16(FIO_FLAG_C)
+#define bfin_read_FIO_FLAG_S()               bfin_read16(FIO_FLAG_S)
+#define bfin_read_FIO_FLAG_D()               bfin_read16(FIO_FLAG_D)
+#endif
+#endif /* _MACH_FIO_FLAG_H */
diff --git a/arch/blackfin/mach-bf533/include/mach/pll.h b/arch/blackfin/mach-bf533/include/mach/pll.h
new file mode 100644
index 00000000000..169c106d0ed
--- /dev/null
+++ b/arch/blackfin/mach-bf533/include/mach/pll.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2005-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr = bfin_read32(SIC_IWR);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR, IWR_ENABLE(0));
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR, iwr);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr = bfin_read32(SIC_IWR);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR, IWR_ENABLE(0));
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR, iwr);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-bf537/include/mach/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h
index 91825c9bd22..fbeb35e1413 100644
--- a/arch/blackfin/mach-bf537/include/mach/cdefBF534.h
+++ b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h
@@ -1750,48 +1750,4 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr = bfin_read32(SIC_IWR);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR, IWR_ENABLE(0));
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR, iwr);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr = bfin_read32(SIC_IWR);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR, IWR_ENABLE(0));
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR, iwr);
-        local_irq_restore_hw(flags);
-}
 #endif                          /* _CDEF_BF534_H */
diff --git a/arch/blackfin/mach-bf537/include/mach/pll.h b/arch/blackfin/mach-bf537/include/mach/pll.h
new file mode 100644
index 00000000000..169c106d0ed
--- /dev/null
+++ b/arch/blackfin/mach-bf537/include/mach/pll.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2005-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr = bfin_read32(SIC_IWR);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR, IWR_ENABLE(0));
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR, iwr);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr = bfin_read32(SIC_IWR);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR, IWR_ENABLE(0));
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR, iwr);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-bf538/include/mach/cdefBF538.h b/arch/blackfin/mach-bf538/include/mach/cdefBF538.h
index 66aa722cf6c..085b06b8c0a 100644
--- a/arch/blackfin/mach-bf538/include/mach/cdefBF538.h
+++ b/arch/blackfin/mach-bf538/include/mach/cdefBF538.h
@@ -2027,54 +2027,4 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
 #endif
diff --git a/arch/blackfin/mach-bf538/include/mach/pll.h b/arch/blackfin/mach-bf538/include/mach/pll.h
new file mode 100644
index 00000000000..b30bbcd412a
--- /dev/null
+++ b/arch/blackfin/mach-bf538/include/mach/pll.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008-2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
index ea3ec4ea9e2..0c16067df4f 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
@@ -2648,61 +2648,5 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1, iwr2;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        iwr2 = bfin_read32(SIC_IWR2);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write32(SIC_IWR2, 0);
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        bfin_write32(SIC_IWR2, iwr2);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1, iwr2;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SIC_IWR0);
-        iwr1 = bfin_read32(SIC_IWR1);
-        iwr2 = bfin_read32(SIC_IWR2);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
-        bfin_write32(SIC_IWR1, 0);
-        bfin_write32(SIC_IWR2, 0);
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SIC_IWR0, iwr0);
-        bfin_write32(SIC_IWR1, iwr1);
-        bfin_write32(SIC_IWR2, iwr2);
-        local_irq_restore_hw(flags);
-}
 #endif /* _CDEF_BF54X_H */
diff --git a/arch/blackfin/mach-bf548/include/mach/pll.h b/arch/blackfin/mach-bf548/include/mach/pll.h
new file mode 100644
index 00000000000..7865a090d33
--- /dev/null
+++ b/arch/blackfin/mach-bf548/include/mach/pll.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2007-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1, iwr2;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        iwr2 = bfin_read32(SIC_IWR2);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write32(SIC_IWR2, 0);
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        bfin_write32(SIC_IWR2, iwr2);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1, iwr2;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SIC_IWR0);
+        iwr1 = bfin_read32(SIC_IWR1);
+        iwr2 = bfin_read32(SIC_IWR2);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SIC_IWR0, IWR_ENABLE(0));
+        bfin_write32(SIC_IWR1, 0);
+        bfin_write32(SIC_IWR2, 0);
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SIC_IWR0, iwr0);
+        bfin_write32(SIC_IWR1, iwr1);
+        bfin_write32(SIC_IWR2, iwr2);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-bf561/include/mach/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h
index 81ecdb71c6a..cc0416a5fa0 100644
--- a/arch/blackfin/mach-bf561/include/mach/cdefBF561.h
+++ b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h
@@ -1534,54 +1534,4 @@
 /* These need to be last due to the cdef/linux inter-dependencies */
 #include <asm/irq.h>
-/* Writing to PLL_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_PLL_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_PLL_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SICA_IWR0);
-        iwr1 = bfin_read32(SICA_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SICA_IWR0, IWR_ENABLE(0));
-        bfin_write32(SICA_IWR1, 0);
-        bfin_write16(PLL_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SICA_IWR0, iwr0);
-        bfin_write32(SICA_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
-/* Writing to VR_CTL initiates a PLL relock sequence. */
-static __inline__ void bfin_write_VR_CTL(unsigned int val)
-{
-        unsigned long flags, iwr0, iwr1;
-        if (val == bfin_read_VR_CTL())
-                return;
-        local_irq_save_hw(flags);
-        /* Enable the PLL Wakeup bit in SIC IWR */
-        iwr0 = bfin_read32(SICA_IWR0);
-        iwr1 = bfin_read32(SICA_IWR1);
-        /* Only allow PPL Wakeup) */
-        bfin_write32(SICA_IWR0, IWR_ENABLE(0));
-        bfin_write32(SICA_IWR1, 0);
-        bfin_write16(VR_CTL, val);
-        SSYNC();
-        asm("IDLE;");
-        bfin_write32(SICA_IWR0, iwr0);
-        bfin_write32(SICA_IWR1, iwr1);
-        local_irq_restore_hw(flags);
-}
 #endif                          /* _CDEF_BF561_H */
diff --git a/arch/blackfin/mach-bf561/include/mach/pll.h b/arch/blackfin/mach-bf561/include/mach/pll.h
new file mode 100644
index 00000000000..f2b1fbdb8e7
--- /dev/null
+++ b/arch/blackfin/mach-bf561/include/mach/pll.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2005-2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef _MACH_PLL_H
+#define _MACH_PLL_H
+#include <asm/blackfin.h>
+#include <asm/irqflags.h>
+/* Writing to PLL_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_PLL_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_PLL_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SICA_IWR0);
+        iwr1 = bfin_read32(SICA_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SICA_IWR0, IWR_ENABLE(0));
+        bfin_write32(SICA_IWR1, 0);
+        bfin_write16(PLL_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SICA_IWR0, iwr0);
+        bfin_write32(SICA_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+/* Writing to VR_CTL initiates a PLL relock sequence. */
+static __inline__ void bfin_write_VR_CTL(unsigned int val)
+{
+        unsigned long flags, iwr0, iwr1;
+        if (val == bfin_read_VR_CTL())
+                return;
+        flags = hard_local_irq_save();
+        /* Enable the PLL Wakeup bit in SIC IWR */
+        iwr0 = bfin_read32(SICA_IWR0);
+        iwr1 = bfin_read32(SICA_IWR1);
+        /* Only allow PPL Wakeup) */
+        bfin_write32(SICA_IWR0, IWR_ENABLE(0));
+        bfin_write32(SICA_IWR1, 0);
+        bfin_write16(VR_CTL, val);
+        SSYNC();
+        asm("IDLE;");
+        bfin_write32(SICA_IWR0, iwr0);
+        bfin_write32(SICA_IWR1, iwr1);
+        hard_local_irq_restore(flags);
+}
+#endif /* _MACH_PLL_H */
diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c
index 4391d03dc84..f4cf11d362e 100644
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
@@ -134,7 +134,7 @@ static int bfin_target(struct cpufreq_policy *poli,
                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
                if (cpu == CPUFREQ_CPU) {
-                        local_irq_save_hw(flags);
+                        flags = hard_local_irq_save();
                        plldiv = (bfin_read_PLL_DIV() & SSEL) |
                                                dpm_state_table[index].csel;
                        bfin_write_PLL_DIV(plldiv);
@@ -155,7 +155,7 @@ static int bfin_target(struct cpufreq_policy *poli,
                                loops_per_jiffy = cpufreq_scale(lpj_ref,
                                                lpj_ref_freq, freqs.new);
                        }
-                        local_irq_restore_hw(flags);
+                        hard_local_irq_restore(flags);
                }
                /* TODO: just test case for cycles clock source, remove later */
                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 1c8c4c7245c..eaece5f84e4 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -132,8 +132,8 @@ static void bfin_ack_noop(unsigned int irq)
 static void bfin_core_mask_irq(unsigned int irq)
 {
        bfin_irq_flags &= ~(1 << irq);
-        if (!irqs_disabled_hw())
+        if (!hard_irqs_disabled())
-                local_irq_enable_hw();
+                hard_local_irq_enable();
 }
 static void bfin_core_unmask_irq(unsigned int irq)
@@ -148,8 +148,8 @@ static void bfin_core_unmask_irq(unsigned int irq)
         * local_irq_enable just does "STI bfin_irq_flags", so it's exactly
         * what we need.
         */
-        if (!irqs_disabled_hw())
+        if (!hard_irqs_disabled())
-                local_irq_enable_hw();
+                hard_local_irq_enable();
        return;
 }
@@ -158,12 +158,12 @@ static void bfin_internal_mask_irq(unsigned int irq)
        unsigned long flags;
 #ifdef CONFIG_BF53x
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
                             ~(1 << SIC_SYSIRQ(irq)));
 #else
        unsigned mask_bank, mask_bit;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        mask_bank = SIC_SYSIRQ(irq) / 32;
        mask_bit = SIC_SYSIRQ(irq) % 32;
        bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) &
@@ -173,7 +173,7 @@ static void bfin_internal_mask_irq(unsigned int irq)
                             ~(1 << mask_bit));
 #endif
 #endif
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 #ifdef CONFIG_SMP
@@ -186,12 +186,12 @@ static void bfin_internal_unmask_irq(unsigned int irq)
        unsigned long flags;
 #ifdef CONFIG_BF53x
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
                             (1 << SIC_SYSIRQ(irq)));
 #else
        unsigned mask_bank, mask_bit;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        mask_bank = SIC_SYSIRQ(irq) / 32;
        mask_bit = SIC_SYSIRQ(irq) % 32;
 #ifdef CONFIG_SMP
@@ -207,7 +207,7 @@ static void bfin_internal_unmask_irq(unsigned int irq)
                        (1 << mask_bit));
 #endif
 #endif
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 #ifdef CONFIG_SMP
@@ -264,7 +264,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
        break;
        }
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        if (state) {
                bfin_sic_iwr[bank] |= (1 << bit);
@@ -275,7 +275,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
                vr_wakeup  &= ~wakeup;
        }
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        return 0;
 }
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 09c1fb41074..80884b136a0 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -25,7 +25,7 @@ void bfin_pm_suspend_standby_enter(void)
 {
        unsigned long flags;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        bfin_pm_standby_setup();
 #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER
@@ -56,7 +56,7 @@ void bfin_pm_suspend_standby_enter(void)
        bfin_write_SIC_IWR(IWR_DISABLE_ALL);
 #endif
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 int bf53x_suspend_l1_mem(unsigned char *memptr)
@@ -149,12 +149,12 @@ int bfin_pm_suspend_mem_enter(void)
        wakeup |= GPWE;
 #endif
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
        ret = blackfin_dma_suspend();
        if (ret) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                kfree(memptr);
                return ret;
        }
@@ -178,7 +178,7 @@ int bfin_pm_suspend_mem_enter(void)
        bfin_gpio_pm_hibernate_restore();
        blackfin_dma_resume();
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
        kfree(memptr);
        return 0;
diff --git a/arch/cris/include/arch-v10/arch/irqflags.h b/arch/cris/include/arch-v10/arch/irqflags.h
new file mode 100644
index 00000000000..75ef1899124
--- /dev/null
+++ b/arch/cris/include/arch-v10/arch/irqflags.h
@@ -0,0 +1,45 @@
+#ifndef __ASM_CRIS_ARCH_IRQFLAGS_H
+#define __ASM_CRIS_ARCH_IRQFLAGS_H
+#include <linux/types.h>
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("move $ccr,%0" : "=rm" (flags) : : "memory");
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+        asm volatile("di" : : : "memory");
+}
+static inline void arch_local_irq_enable(void)
+{
+        asm volatile("ei" : : : "memory");
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        arch_local_irq_disable();
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile("move %0,$ccr" : : "rm" (flags) : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return !(flags & (1 << 5));
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* __ASM_CRIS_ARCH_IRQFLAGS_H */
diff --git a/arch/cris/include/arch-v10/arch/system.h b/arch/cris/include/arch-v10/arch/system.h
index 4a9cd36c9e1..935fde34aa1 100644
--- a/arch/cris/include/arch-v10/arch/system.h
+++ b/arch/cris/include/arch-v10/arch/system.h
@@ -44,20 +44,4 @@ static inline unsigned long _get_base(char * addr)
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((struct __xchg_dummy *)(x))
-/* interrupt control.. */
-#define local_save_flags(x)     __asm__ __volatile__ ("move $ccr,%0" : "=rm" (x) : : "memory");
-#define local_irq_restore(x)    __asm__ __volatile__ ("move %0,$ccr" : : "rm" (x) : "memory");
-#define local_irq_disable()     __asm__ __volatile__ ( "di" : : :"memory");
-#define local_irq_enable()      __asm__ __volatile__ ( "ei" : : :"memory");
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        !(flags & (1<<5));              \
-})
-/* For spinlocks etc */
-#define local_irq_save(x) __asm__ __volatile__ ("move $ccr,%0\n\tdi" : "=rm" (x) : : "memory");
 #endif
diff --git a/arch/cris/include/arch-v32/arch/irqflags.h b/arch/cris/include/arch-v32/arch/irqflags.h
new file mode 100644
index 00000000000..041851f8ec6
--- /dev/null
+++ b/arch/cris/include/arch-v32/arch/irqflags.h
@@ -0,0 +1,46 @@
+#ifndef __ASM_CRIS_ARCH_IRQFLAGS_H
+#define __ASM_CRIS_ARCH_IRQFLAGS_H
+#include <linux/types.h>
+#include <arch/ptrace.h>
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("move $ccs,%0" : "=rm" (flags) : : "memory");
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+        asm volatile("di" : : : "memory");
+}
+static inline void arch_local_irq_enable(void)
+{
+        asm volatile("ei" : : : "memory");
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        arch_local_irq_disable();
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile("move %0,$ccs" : : "rm" (flags) : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return !(flags & (1 << I_CCS_BITNR));
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* __ASM_CRIS_ARCH_IRQFLAGS_H */
diff --git a/arch/cris/include/arch-v32/arch/system.h b/arch/cris/include/arch-v32/arch/system.h
index 6ca90f1f110..76cea99eaa6 100644
--- a/arch/cris/include/arch-v32/arch/system.h
+++ b/arch/cris/include/arch-v32/arch/system.h
@@ -44,26 +44,4 @@ static inline unsigned long rdsp(void)
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((struct __xchg_dummy *)(x))
-/* Used for interrupt control. */
-#define local_save_flags(x) \
-        __asm__ __volatile__ ("move $ccs, %0" : "=rm" (x) : : "memory");
-#define local_irq_restore(x) \
-        __asm__ __volatile__ ("move %0, $ccs" : : "rm" (x) : "memory");
-#define local_irq_disable()  __asm__ __volatile__ ("di" : : : "memory");
-#define local_irq_enable()   __asm__ __volatile__ ("ei" : : : "memory");
-#define irqs_disabled()         \
-({                              \
-        unsigned long flags;    \
-                                \
-        local_save_flags(flags);\
-        !(flags & (1 << I_CCS_BITNR));  \
-})
-/* Used for spinlocks, etc. */
-#define local_irq_save(x) \
-        __asm__ __volatile__ ("move $ccs, %0\n\tdi" : "=rm" (x) : : "memory");
 #endif /* _ASM_CRIS_ARCH_SYSTEM_H */
diff --git a/arch/cris/include/asm/irqflags.h b/arch/cris/include/asm/irqflags.h
new file mode 100644
index 00000000000..943ba5ca6d2
--- /dev/null
+++ b/arch/cris/include/asm/irqflags.h
@@ -0,0 +1 @@
+#include <arch/irqflags.h>
diff --git a/arch/cris/include/asm/system.h b/arch/cris/include/asm/system.h
index 8657b084a92..ea10592f7d7 100644
--- a/arch/cris/include/asm/system.h
+++ b/arch/cris/include/asm/system.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_CRIS_SYSTEM_H
 #define __ASM_CRIS_SYSTEM_H
+#include <linux/irqflags.h>
 #include <arch/system.h>
 /* the switch_to macro calls resume, an asm function in entry.S which does the actual
diff --git a/arch/frv/include/asm/irqflags.h b/arch/frv/include/asm/irqflags.h
new file mode 100644
index 00000000000..82f0b5363f4
--- /dev/null
+++ b/arch/frv/include/asm/irqflags.h
@@ -0,0 +1,158 @@
+/* FR-V interrupt handling
+ *
+ * Copyright (C) 2010 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _ASM_IRQFLAGS_H
+#define _ASM_IRQFLAGS_H
+/*
+ * interrupt flag manipulation
+ * - use virtual interrupt management since touching the PSR is slow
+ *   - ICC2.Z: T if interrupts virtually disabled
+ *   - ICC2.C: F if interrupts really disabled
+ * - if Z==1 upon interrupt:
+ *   - C is set to 0
+ *   - interrupts are really disabled
+ *   - entry.S returns immediately
+ * - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
+ *   - if taken, the trap:
+ *     - sets ICC2.C
+ *     - enables interrupts
+ */
+static inline void arch_local_irq_disable(void)
+{
+        /* set Z flag, but don't change the C flag */
+        asm volatile("  andcc   gr0,gr0,gr0,icc2        \n"
+                     :
+                     :
+                     : "memory", "icc2"
+                     );
+}
+static inline void arch_local_irq_enable(void)
+{
+        /* clear Z flag and then test the C flag */
+        asm volatile("  oricc   gr0,#1,gr0,icc2         \n"
+                     "  tihi    icc2,gr0,#2             \n"
+                     :
+                     :
+                     : "memory", "icc2"
+                     );
+}
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("movsg ccr,%0"
+                     : "=r"(flags)
+                     :
+                     : "memory");
+        /* shift ICC2.Z to bit 0 */
+        flags >>= 26;
+        /* make flags 1 if interrupts disabled, 0 otherwise */
+        return flags & 1UL;
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        arch_local_irq_disable();
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        /* load the Z flag by turning 1 if disabled into 0 if disabled
+         * and thus setting the Z flag but not the C flag */
+        asm volatile("  xoricc  %0,#1,gr0,icc2          \n"
+                     /* then trap if Z=0 and C=0 */
+                     "  tihi    icc2,gr0,#2             \n"
+                     :
+                     : "r"(flags)
+                     : "memory", "icc2"
+                     );
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return flags;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+/*
+ * real interrupt flag manipulation
+ */
+#define __arch_local_irq_disable()                      \
+do {                                                    \
+        unsigned long psr;                              \
+        asm volatile("  movsg   psr,%0          \n"     \
+                     "  andi    %0,%2,%0        \n"     \
+                     "  ori     %0,%1,%0        \n"     \
+                     "  movgs   %0,psr          \n"     \
+                     : "=r"(psr)                        \
+                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
+                     : "memory");                       \
+} while (0)
+#define __arch_local_irq_enable()                       \
+do {                                                    \
+        unsigned long psr;                              \
+        asm volatile("  movsg   psr,%0          \n"     \
+                     "  andi    %0,%1,%0        \n"     \
+                     "  movgs   %0,psr          \n"     \
+                     : "=r"(psr)                        \
+                     : "i" (~PSR_PIL)                   \
+                     : "memory");                       \
+} while (0)
+#define __arch_local_save_flags(flags)          \
+do {                                            \
+        typecheck(unsigned long, flags);        \
+        asm("movsg psr,%0"                      \
+            : "=r"(flags)                       \
+            :                                   \
+            : "memory");                        \
+} while (0)
+#define __arch_local_irq_save(flags)                    \
+do {                                                    \
+        unsigned long npsr;                             \
+        typecheck(unsigned long, flags);                \
+        asm volatile("  movsg   psr,%0          \n"     \
+                     "  andi    %0,%3,%1        \n"     \
+                     "  ori     %1,%2,%1        \n"     \
+                     "  movgs   %1,psr          \n"     \
+                     : "=r"(flags), "=r"(npsr)          \
+                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
+                     : "memory");                       \
+} while (0)
+#define __arch_local_irq_restore(flags)                 \
+do {                                                    \
+        typecheck(unsigned long, flags);                \
+        asm volatile("  movgs   %0,psr          \n"     \
+                     :                                  \
+                     : "r" (flags)                      \
+                     : "memory");                       \
+} while (0)
+#define __arch_irqs_disabled()                  \
+        ((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
+#endif /* _ASM_IRQFLAGS_H */
diff --git a/arch/frv/include/asm/system.h b/arch/frv/include/asm/system.h
index efd22d9077a..0a6d8d9ca45 100644
--- a/arch/frv/include/asm/system.h
+++ b/arch/frv/include/asm/system.h
@@ -37,142 +37,6 @@ do {									\
 } while(0)
 /*
- * interrupt flag manipulation
- * - use virtual interrupt management since touching the PSR is slow
- *   - ICC2.Z: T if interrupts virtually disabled
- *   - ICC2.C: F if interrupts really disabled
- * - if Z==1 upon interrupt:
- *   - C is set to 0
- *   - interrupts are really disabled
- *   - entry.S returns immediately
- * - uses TIHI (TRAP if Z==0 && C==0) #2 to really reenable interrupts
- *   - if taken, the trap:
- *     - sets ICC2.C
- *     - enables interrupts
- */
-#define local_irq_disable()                                     \
-do {                                                            \
-        /* set Z flag, but don't change the C flag */           \
-        asm volatile("  andcc   gr0,gr0,gr0,icc2        \n"     \
-                     :                                          \
-                     :                                          \
-                     : "memory", "icc2"                         \
-                     );                                         \
-} while(0)
-#define local_irq_enable()                                      \
-do {                                                            \
-        /* clear Z flag and then test the C flag */             \
-        asm volatile("  oricc   gr0,#1,gr0,icc2         \n"     \
-                     "  tihi    icc2,gr0,#2             \n"     \
-                     :                                          \
-                     :                                          \
-                     : "memory", "icc2"                         \
-                     );                                         \
-} while(0)
-#define local_save_flags(flags)                                 \
-do {                                                            \
-        typecheck(unsigned long, flags);                        \
-        asm volatile("movsg ccr,%0"                             \
-                     : "=r"(flags)                              \
-                     :                                          \
-                     : "memory");                               \
-                                                                \
-        /* shift ICC2.Z to bit 0 */                             \
-        flags >>= 26;                                           \
-                                                                \
-        /* make flags 1 if interrupts disabled, 0 otherwise */  \
-        flags &= 1UL;                                           \
-} while(0)
-#define irqs_disabled() \
-        ({unsigned long flags; local_save_flags(flags); !!flags; })
-#define local_irq_save(flags)                   \
-do {                                            \
-        typecheck(unsigned long, flags);        \
-        local_save_flags(flags);                \
-        local_irq_disable();                    \
-} while(0)
-#define local_irq_restore(flags)                                        \
-do {                                                                    \
-        typecheck(unsigned long, flags);                                \
-                                                                        \
-        /* load the Z flag by turning 1 if disabled into 0 if disabled  \
-         * and thus setting the Z flag but not the C flag */            \
-        asm volatile("  xoricc  %0,#1,gr0,icc2          \n"             \
-                     /* then test Z=0 and C=0 */                        \
-                     "  tihi    icc2,gr0,#2             \n"             \
-                     :                                                  \
-                     : "r"(flags)                                       \
-                     : "memory", "icc2"                                 \
-                     );                                                 \
-                                                                        \
-} while(0)
-/*
- * real interrupt flag manipulation
- */
-#define __local_irq_disable()                           \
-do {                                                    \
-        unsigned long psr;                              \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%2,%0        \n"     \
-                     "  ori     %0,%1,%0        \n"     \
-                     "  movgs   %0,psr          \n"     \
-                     : "=r"(psr)                        \
-                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
-                     : "memory");                       \
-} while(0)
-#define __local_irq_enable()                            \
-do {                                                    \
-        unsigned long psr;                              \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%1,%0        \n"     \
-                     "  movgs   %0,psr          \n"     \
-                     : "=r"(psr)                        \
-                     : "i" (~PSR_PIL)                   \
-                     : "memory");                       \
-} while(0)
-#define __local_save_flags(flags)               \
-do {                                            \
-        typecheck(unsigned long, flags);        \
-        asm("movsg psr,%0"                      \
-            : "=r"(flags)                       \
-            :                                   \
-            : "memory");                        \
-} while(0)
-#define __local_irq_save(flags)                         \
-do {                                                    \
-        unsigned long npsr;                             \
-        typecheck(unsigned long, flags);                \
-        asm volatile("  movsg   psr,%0          \n"     \
-                     "  andi    %0,%3,%1        \n"     \
-                     "  ori     %1,%2,%1        \n"     \
-                     "  movgs   %1,psr          \n"     \
-                     : "=r"(flags), "=r"(npsr)          \
-                     : "i" (PSR_PIL_14), "i" (~PSR_PIL) \
-                     : "memory");                       \
-} while(0)
-#define __local_irq_restore(flags)                      \
-do {                                                    \
-        typecheck(unsigned long, flags);                \
-        asm volatile("  movgs   %0,psr          \n"     \
-                     :                                  \
-                     : "r" (flags)                      \
-                     : "memory");                       \
-} while(0)
-#define __irqs_disabled() \
-        ((__get_PSR() & PSR_PIL) >= PSR_PIL_14)
-/*
 * Force strict CPU ordering.
 */
 #define nop()                   asm volatile ("nop"::)
diff --git a/arch/h8300/include/asm/irqflags.h b/arch/h8300/include/asm/irqflags.h
new file mode 100644
index 00000000000..9617cd57aeb
--- /dev/null
+++ b/arch/h8300/include/asm/irqflags.h
@@ -0,0 +1,43 @@
+#ifndef _H8300_IRQFLAGS_H
+#define _H8300_IRQFLAGS_H
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile ("stc ccr,%w0" : "=r" (flags));
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+        asm volatile ("orc  #0x80,ccr" : : : "memory");
+}
+static inline void arch_local_irq_enable(void)
+{
+        asm volatile ("andc #0x7f,ccr" : : : "memory");
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        arch_local_irq_disable();
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile ("ldc %w0,ccr" : : "r" (flags) : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & 0x80) == 0x80;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* _H8300_IRQFLAGS_H */
diff --git a/arch/h8300/include/asm/system.h b/arch/h8300/include/asm/system.h
index 16bf1560ff6..2c2382e50d9 100644
--- a/arch/h8300/include/asm/system.h
+++ b/arch/h8300/include/asm/system.h
@@ -2,6 +2,7 @@
 #define _H8300_SYSTEM_H
 #include <linux/linkage.h>
+#include <linux/irqflags.h>
 struct pt_regs;
@@ -51,31 +52,8 @@ asmlinkage void resume(void);
  (last) = _last;                                           \
 }
-#define __sti() asm volatile ("andc #0x7f,ccr")
-#define __cli() asm volatile ("orc  #0x80,ccr")
-#define __save_flags(x) \
-       asm volatile ("stc ccr,%w0":"=r" (x))
-#define __restore_flags(x) \
-       asm volatile ("ldc %w0,ccr": :"r" (x))
-#define irqs_disabled()                 \
-({                                      \
-        unsigned char flags;            \
-        __save_flags(flags);            \
-        ((flags & 0x80) == 0x80);       \
-})
 #define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc")
-/* For spinlocks etc */
-#define local_irq_disable()     __cli()
-#define local_irq_enable()      __sti()
-#define local_irq_save(x)       ({ __save_flags(x); local_irq_disable(); })
-#define local_irq_restore(x)    __restore_flags(x)
-#define local_save_flags(x)     __save_flags(x)
 /*
 * Force strict CPU ordering.
 * Not really required on H8...
diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h
new file mode 100644
index 00000000000..f82d6be2ecd
--- /dev/null
+++ b/arch/ia64/include/asm/irqflags.h
@@ -0,0 +1,94 @@
+/*
+ * IRQ flags defines.
+ *
+ * Copyright (C) 1998-2003 Hewlett-Packard Co
+ *      David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1999 Asit Mallick <asit.k.mallick@intel.com>
+ * Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
+ */
+#ifndef _ASM_IA64_IRQFLAGS_H
+#define _ASM_IA64_IRQFLAGS_H
+#ifdef CONFIG_IA64_DEBUG_IRQ
+extern unsigned long last_cli_ip;
+static inline void arch_maybe_save_ip(unsigned long flags)
+{
+        if (flags & IA64_PSR_I)
+                last_cli_ip = ia64_getreg(_IA64_REG_IP);
+}
+#else
+#define arch_maybe_save_ip(flags) do {} while (0)
+#endif
+/*
+ * - clearing psr.i is implicitly serialized (visible by next insn)
+ * - setting psr.i requires data serialization
+ * - we need a stop-bit before reading PSR because we sometimes
+ *   write a floating-point register right before reading the PSR
+ *   and that writes to PSR.mfl
+ */
+static inline unsigned long arch_local_save_flags(void)
+{
+        ia64_stop();
+#ifdef CONFIG_PARAVIRT
+        return ia64_get_psr_i();
+#else
+        return ia64_getreg(_IA64_REG_PSR);
+#endif
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        ia64_stop();
+        ia64_rsm(IA64_PSR_I);
+        arch_maybe_save_ip(flags);
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+#ifdef CONFIG_IA64_DEBUG_IRQ
+        arch_local_irq_save();
+#else
+        ia64_stop();
+        ia64_rsm(IA64_PSR_I);
+#endif
+}
+static inline void arch_local_irq_enable(void)
+{
+        ia64_stop();
+        ia64_ssm(IA64_PSR_I);
+        ia64_srlz_d();
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+#ifdef CONFIG_IA64_DEBUG_IRQ
+        unsigned long old_psr = arch_local_save_flags();
+#endif
+        ia64_intrin_local_irq_restore(flags & IA64_PSR_I);
+        arch_maybe_save_ip(old_psr & ~flags);
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & IA64_PSR_I) == 0;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+static inline void arch_safe_halt(void)
+{
+        ia64_pal_halt_light();  /* PAL_HALT_LIGHT */
+}
+#endif /* _ASM_IA64_IRQFLAGS_H */
diff --git a/arch/ia64/include/asm/system.h b/arch/ia64/include/asm/system.h
index dd028f2b13b..6cca30705d5 100644
--- a/arch/ia64/include/asm/system.h
+++ b/arch/ia64/include/asm/system.h
@@ -107,87 +107,11 @@ extern struct ia64_boot_param {
 */
 #define set_mb(var, value)      do { (var) = (value); mb(); } while (0)
-#define safe_halt()         ia64_pal_halt_light()    /* PAL_HALT_LIGHT */
 /*
 * The group barrier in front of the rsm & ssm are necessary to ensure
 * that none of the previous instructions in the same group are
 * affected by the rsm/ssm.
 */
-/* For spinlocks etc */
-/*
- * - clearing psr.i is implicitly serialized (visible by next insn)
- * - setting psr.i requires data serialization
- * - we need a stop-bit before reading PSR because we sometimes
- *   write a floating-point register right before reading the PSR
- *   and that writes to PSR.mfl
- */
-#ifdef CONFIG_PARAVIRT
-#define __local_save_flags()    ia64_get_psr_i()
-#else
-#define __local_save_flags()    ia64_getreg(_IA64_REG_PSR)
-#endif
-#define __local_irq_save(x)                     \
-do {                                            \
-        ia64_stop();                            \
-        (x) = __local_save_flags();             \
-        ia64_stop();                            \
-        ia64_rsm(IA64_PSR_I);                   \
-} while (0)
-#define __local_irq_disable()                   \
-do {                                            \
-        ia64_stop();                            \
-        ia64_rsm(IA64_PSR_I);                   \
-} while (0)
-#define __local_irq_restore(x)  ia64_intrin_local_irq_restore((x) & IA64_PSR_I)
-#ifdef CONFIG_IA64_DEBUG_IRQ
-  extern unsigned long last_cli_ip;
-# define __save_ip()            last_cli_ip = ia64_getreg(_IA64_REG_IP)
-# define local_irq_save(x)                                      \
-do {                                                            \
-        unsigned long __psr;                                    \
-                                                                \
-        __local_irq_save(__psr);                                \
-        if (__psr & IA64_PSR_I)                                 \
-                __save_ip();                                    \
-        (x) = __psr;                                            \
-} while (0)
-# define local_irq_disable()    do { unsigned long __x; local_irq_save(__x); } while (0)
-# define local_irq_restore(x)                                   \
-do {                                                            \
-        unsigned long __old_psr, __psr = (x);                   \
-                                                                \
-        local_save_flags(__old_psr);                            \
-        __local_irq_restore(__psr);                             \
-        if ((__old_psr & IA64_PSR_I) && !(__psr & IA64_PSR_I))  \
-                __save_ip();                                    \
-} while (0)
-#else /* !CONFIG_IA64_DEBUG_IRQ */
-# define local_irq_save(x)      __local_irq_save(x)
-# define local_irq_disable()    __local_irq_disable()
-# define local_irq_restore(x)   __local_irq_restore(x)
-#endif /* !CONFIG_IA64_DEBUG_IRQ */
-#define local_irq_enable()      ({ ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); })
-#define local_save_flags(flags) ({ ia64_stop(); (flags) = __local_save_flags(); })
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long __ia64_id_flags;          \
-        local_save_flags(__ia64_id_flags);      \
-        (__ia64_id_flags & IA64_PSR_I) == 0;    \
-})
 #ifdef __KERNEL__
diff --git a/arch/m32r/include/asm/irqflags.h b/arch/m32r/include/asm/irqflags.h
new file mode 100644
index 00000000000..1f92d29982a
--- /dev/null
+++ b/arch/m32r/include/asm/irqflags.h
@@ -0,0 +1,104 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2001  Hiroyuki Kondo, Hirokazu Takata, and Hitoshi Yamamoto
+ * Copyright (C) 2004, 2006  Hirokazu Takata <takata at linux-m32r.org>
+ */
+#ifndef _ASM_M32R_IRQFLAGS_H
+#define _ASM_M32R_IRQFLAGS_H
+#include <linux/types.h>
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("mvfc %0,psw" : "=r"(flags));
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
+        asm volatile (
+                "clrpsw #0x40 -> nop"
+                : : : "memory");
+#else
+        unsigned long tmpreg0, tmpreg1;
+        asm volatile (
+                "ld24   %0, #0  ; Use 32-bit insn.                      \n\t"
+                "mvfc   %1, psw ; No interrupt can be accepted here.    \n\t"
+                "mvtc   %0, psw                                         \n\t"
+                "and3   %0, %1, #0xffbf                                 \n\t"
+                "mvtc   %0, psw                                         \n\t"
+                : "=&r" (tmpreg0), "=&r" (tmpreg1)
+                :
+                : "cbit", "memory");
+#endif
+}
+static inline void arch_local_irq_enable(void)
+{
+#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
+        asm volatile (
+                "setpsw #0x40 -> nop"
+                : : : "memory");
+#else
+        unsigned long tmpreg;
+        asm volatile (
+                "mvfc   %0, psw;                \n\t"
+                "or3    %0, %0, #0x0040;        \n\t"
+                "mvtc   %0, psw;                \n\t"
+                : "=&r" (tmpreg)
+                :
+                : "cbit", "memory");
+#endif
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags;
+#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
+        asm volatile (
+                "mvfc   %0, psw;        \n\t"
+                "clrpsw #0x40 -> nop;   \n\t"
+                : "=r" (flags)
+                :
+                : "memory");
+#else
+        unsigned long tmpreg;
+        asm volatile (
+                "ld24   %1, #0          \n\t"
+                "mvfc   %0, psw         \n\t"
+                "mvtc   %1, psw         \n\t"
+                "and3   %1, %0, #0xffbf \n\t"
+                "mvtc   %1, psw         \n\t"
+                : "=r" (flags), "=&r" (tmpreg)
+                :
+                : "cbit", "memory");
+#endif
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile("mvtc %0,psw"
+                     :
+                     : "r" (flags)
+                     : "cbit", "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return !(flags & 0x40);
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* _ASM_M32R_IRQFLAGS_H */
diff --git a/arch/m32r/include/asm/system.h b/arch/m32r/include/asm/system.h
index c980f5ba8de..13c46794ccb 100644
--- a/arch/m32r/include/asm/system.h
+++ b/arch/m32r/include/asm/system.h
@@ -11,6 +11,7 @@
 */
 #include <linux/compiler.h>
+#include <linux/irqflags.h>
 #include <asm/assembler.h>
 #ifdef __KERNEL__
@@ -54,71 +55,6 @@
        ); \
 } while(0)
-/* Interrupt Control */
-#if !defined(CONFIG_CHIP_M32102) && !defined(CONFIG_CHIP_M32104)
-#define local_irq_enable() \
-        __asm__ __volatile__ ("setpsw #0x40 -> nop": : :"memory")
-#define local_irq_disable() \
-        __asm__ __volatile__ ("clrpsw #0x40 -> nop": : :"memory")
-#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-static inline void local_irq_enable(void)
-{
-        unsigned long tmpreg;
-        __asm__ __volatile__(
-                "mvfc   %0, psw;                \n\t"
-                "or3    %0, %0, #0x0040;        \n\t"
-                "mvtc   %0, psw;                \n\t"
-        : "=&r" (tmpreg) : : "cbit", "memory");
-}
-static inline void local_irq_disable(void)
-{
-        unsigned long tmpreg0, tmpreg1;
-        __asm__ __volatile__(
-                "ld24   %0, #0  ; Use 32-bit insn. \n\t"
-                "mvfc   %1, psw ; No interrupt can be accepted here. \n\t"
-                "mvtc   %0, psw \n\t"
-                "and3   %0, %1, #0xffbf \n\t"
-                "mvtc   %0, psw \n\t"
-        : "=&r" (tmpreg0), "=&r" (tmpreg1) : : "cbit", "memory");
-}
-#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-#define local_save_flags(x) \
-        __asm__ __volatile__("mvfc %0,psw" : "=r"(x) : /* no input */)
-#define local_irq_restore(x) \
-        __asm__ __volatile__("mvtc %0,psw" : /* no outputs */ \
-                : "r" (x) : "cbit", "memory")
-#if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104))
-#define local_irq_save(x)                               \
-        __asm__ __volatile__(                           \
-                "mvfc   %0, psw;                \n\t"   \
-                "clrpsw #0x40 -> nop;           \n\t"   \
-                : "=r" (x) : /* no input */ : "memory")
-#else   /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-#define local_irq_save(x)                               \
-        ({                                              \
-                unsigned long tmpreg;                   \
-                __asm__ __volatile__(                   \
-                        "ld24   %1, #0 \n\t"            \
-                        "mvfc   %0, psw \n\t"           \
-                        "mvtc   %1, psw \n\t"           \
-                        "and3   %1, %0, #0xffbf \n\t"   \
-                        "mvtc   %1, psw \n\t"           \
-                        : "=r" (x), "=&r" (tmpreg)      \
-                        : : "cbit", "memory");          \
-        })
-#endif  /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */
-#define irqs_disabled()                                 \
-        ({                                              \
-                unsigned long flags;                    \
-                local_save_flags(flags);                \
-                !(flags & 0x40);                        \
-        })
 #define nop()   __asm__ __volatile__ ("nop" : : )
 #define xchg(ptr, x)                                                    \
diff --git a/arch/m68k/include/asm/entry_no.h b/arch/m68k/include/asm/entry_no.h
index 907ed03d792..80e41492aa2 100644
--- a/arch/m68k/include/asm/entry_no.h
+++ b/arch/m68k/include/asm/entry_no.h
@@ -28,7 +28,7 @@
 *                      M68K              COLDFIRE
 */
-#define ALLOWINT 0xf8ff
+#define ALLOWINT (~0x700)
 #ifdef __ASSEMBLY__
diff --git a/arch/m68k/include/asm/irqflags.h b/arch/m68k/include/asm/irqflags.h
new file mode 100644
index 00000000000..4a5b284a155
--- /dev/null
+++ b/arch/m68k/include/asm/irqflags.h
@@ -0,0 +1,76 @@
+#ifndef _M68K_IRQFLAGS_H
+#define _M68K_IRQFLAGS_H
+#include <linux/types.h>
+#include <linux/hardirq.h>
+#include <linux/preempt.h>
+#include <asm/thread_info.h>
+#include <asm/entry.h>
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile ("movew %%sr,%0" : "=d" (flags) : : "memory");
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+#ifdef CONFIG_COLDFIRE
+        asm volatile (
+                "move   %/sr,%%d0       \n\t"
+                "ori.l  #0x0700,%%d0    \n\t"
+                "move   %%d0,%/sr       \n"
+                : /* no outputs */
+                :
+                : "cc", "%d0", "memory");
+#else
+        asm volatile ("oriw  #0x0700,%%sr" : : : "memory");
+#endif
+}
+static inline void arch_local_irq_enable(void)
+{
+#if defined(CONFIG_COLDFIRE)
+        asm volatile (
+                "move   %/sr,%%d0       \n\t"
+                "andi.l #0xf8ff,%%d0    \n\t"
+                "move   %%d0,%/sr       \n"
+                : /* no outputs */
+                :
+                : "cc", "%d0", "memory");
+#else
+# if defined(CONFIG_MMU)
+        if (MACH_IS_Q40 || !hardirq_count())
+# endif
+                asm volatile (
+                        "andiw %0,%%sr"
+                        :
+                        : "i" (ALLOWINT)
+                        : "memory");
+#endif
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        arch_local_irq_disable();
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile ("movew %0,%%sr" : : "d" (flags) : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & ~ALLOWINT) != 0;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* _M68K_IRQFLAGS_H */
diff --git a/arch/m68k/include/asm/system_mm.h b/arch/m68k/include/asm/system_mm.h
index dbb6515ffd5..12053c44ccc 100644
--- a/arch/m68k/include/asm/system_mm.h
+++ b/arch/m68k/include/asm/system_mm.h
@@ -3,6 +3,7 @@
 #include <linux/linkage.h>
 #include <linux/kernel.h>
+#include <linux/irqflags.h>
 #include <asm/segment.h>
 #include <asm/entry.h>
@@ -62,30 +63,6 @@ asmlinkage void resume(void);
 #define smp_wmb()       barrier()
 #define smp_read_barrier_depends()      ((void)0)
-/* interrupt control.. */
-#if 0
-#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
-#else
-#include <linux/hardirq.h>
-#define local_irq_enable() ({                                                   \
-        if (MACH_IS_Q40 || !hardirq_count())                                    \
-                asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory");    \
-})
-#endif
-#define local_irq_disable() asm volatile ("oriw  #0x0700,%%sr": : : "memory")
-#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
-#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
-static inline int irqs_disabled(void)
-{
-        unsigned long flags;
-        local_save_flags(flags);
-        return flags & ~ALLOWINT;
-}
-/* For spinlocks etc */
-#define local_irq_save(x)       ({ local_save_flags(x); local_irq_disable(); })
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 struct __xchg_dummy { unsigned long a[100]; };
diff --git a/arch/m68k/include/asm/system_no.h b/arch/m68k/include/asm/system_no.h
index 3c0718d7439..20126c09794 100644
--- a/arch/m68k/include/asm/system_no.h
+++ b/arch/m68k/include/asm/system_no.h
@@ -2,6 +2,7 @@
 #define _M68KNOMMU_SYSTEM_H
 #include <linux/linkage.h>
+#include <linux/irqflags.h>
 #include <asm/segment.h>
 #include <asm/entry.h>
@@ -46,54 +47,6 @@ asmlinkage void resume(void);
  (last) = _last;                                               \
 }
-#ifdef CONFIG_COLDFIRE
-#define local_irq_enable() __asm__ __volatile__ (               \
-        "move %/sr,%%d0\n\t"                                    \
-        "andi.l #0xf8ff,%%d0\n\t"                               \
-        "move %%d0,%/sr\n"                                      \
-        : /* no outputs */                                      \
-        :                                                       \
-        : "cc", "%d0", "memory")
-#define local_irq_disable() __asm__ __volatile__ (              \
-        "move %/sr,%%d0\n\t"                                    \
-        "ori.l #0x0700,%%d0\n\t"                                \
-        "move %%d0,%/sr\n"                                      \
-        : /* no outputs */                                      \
-        :                                                       \
-        : "cc", "%d0", "memory")
-/* For spinlocks etc */
-#define local_irq_save(x) __asm__ __volatile__ (                \
-        "movew %%sr,%0\n\t"                                     \
-        "movew #0x0700,%%d0\n\t"                                \
-        "or.l  %0,%%d0\n\t"                                     \
-        "movew %%d0,%/sr"                                       \
-        : "=d" (x)                                              \
-        :                                                       \
-        : "cc", "%d0", "memory")
-#else
-/* portable version */ /* FIXME - see entry.h*/
-#define ALLOWINT 0xf8ff
-#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
-#define local_irq_disable() asm volatile ("oriw  #0x0700,%%sr": : : "memory")
-#endif
-#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
-#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
-/* For spinlocks etc */
-#ifndef local_irq_save
-#define local_irq_save(x) do { local_save_flags(x); local_irq_disable(); } while (0)
-#endif
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        ((flags & 0x0700) == 0x0700);   \
-})
 #define iret() __asm__ __volatile__ ("rte": : :"memory", "sp", "cc")
 /*
@@ -206,12 +159,4 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 #define arch_align_stack(x) (x)
-static inline int irqs_disabled_flags(unsigned long flags)
-{
-        if (flags & 0x0700)
-                return 0;
-        else
-                return 1;
-}
 #endif /* _M68KNOMMU_SYSTEM_H */
diff --git a/arch/m68knommu/kernel/asm-offsets.c b/arch/m68knommu/kernel/asm-offsets.c
index 9a8876f715d..24335022fa2 100644
--- a/arch/m68knommu/kernel/asm-offsets.c
+++ b/arch/m68knommu/kernel/asm-offsets.c
@@ -74,8 +74,6 @@ int main(void)
        DEFINE(PT_PTRACED, PT_PTRACED);
-        DEFINE(THREAD_SIZE, THREAD_SIZE);
        /* Offsets in thread_info structure */
        DEFINE(TI_TASK, offsetof(struct thread_info, task));
        DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
diff --git a/arch/m68knommu/platform/coldfire/head.S b/arch/m68knommu/platform/coldfire/head.S
index 4b91aa24eb0..0b2d7c7adf7 100644
--- a/arch/m68knommu/platform/coldfire/head.S
+++ b/arch/m68knommu/platform/coldfire/head.S
@@ -15,6 +15,7 @@
 #include <asm/coldfire.h>
 #include <asm/mcfcache.h>
 #include <asm/mcfsim.h>
+#include <asm/thread_info.h>
 /*****************************************************************************/
diff --git a/arch/microblaze/include/asm/irqflags.h b/arch/microblaze/include/asm/irqflags.h
index 2c38c6d8017..5fd31905775 100644
--- a/arch/microblaze/include/asm/irqflags.h
+++ b/arch/microblaze/include/asm/irqflags.h
@@ -9,103 +9,114 @@
 #ifndef _ASM_MICROBLAZE_IRQFLAGS_H
 #define _ASM_MICROBLAZE_IRQFLAGS_H
-#include <linux/irqflags.h>
+#include <linux/types.h>
 #include <asm/registers.h>
-# if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
+#ifdef CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
-# define raw_local_irq_save(flags)                      \
+static inline unsigned long arch_local_irq_save(void)
-        do {                                            \
+{
-                asm volatile (" msrclr %0, %1;          \
+        unsigned long flags;
-                                nop;"                   \
+        asm volatile("  msrclr %0, %1   \n"
-                                : "=r"(flags)           \
+                     "  nop             \n"
-                                : "i"(MSR_IE)           \
+                     : "=r"(flags)
-                                : "memory");            \
+                     : "i"(MSR_IE)
-        } while (0)
+                     : "memory");
+        return flags;
-# define raw_local_irq_disable()                        \
+}
-        do {                                            \
-                asm volatile (" msrclr r0, %0;          \
+static inline void arch_local_irq_disable(void)
-                                nop;"                   \
+{
-                                :                       \
+        /* this uses r0 without declaring it - is that correct? */
-                                : "i"(MSR_IE)           \
+        asm volatile("  msrclr r0, %0   \n"
-                                : "memory");            \
+                     "  nop             \n"
-        } while (0)
+                     :
+                     : "i"(MSR_IE)
-# define raw_local_irq_enable()                         \
+                     : "memory");
-        do {                                            \
+}
-                asm volatile (" msrset  r0, %0;         \
-                                nop;"                   \
+static inline void arch_local_irq_enable(void)
-                                :                       \
+{
-                                : "i"(MSR_IE)           \
+        /* this uses r0 without declaring it - is that correct? */
-                                : "memory");            \
+        asm volatile("  msrset  r0, %0  \n"
-        } while (0)
+                     "  nop             \n"
+                     :
-# else /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR == 0 */
+                     : "i"(MSR_IE)
+                     : "memory");
-# define raw_local_irq_save(flags)                              \
+}
-        do {                                                    \
-                register unsigned tmp;                          \
+#else /* !CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
-                asm volatile (" mfs     %0, rmsr;               \
-                                nop;                            \
+static inline unsigned long arch_local_irq_save(void)
-                                andi    %1, %0, %2;             \
+{
-                                mts     rmsr, %1;               \
+        unsigned long flags, tmp;
-                                nop;"                           \
+        asm volatile (" mfs     %0, rmsr        \n"
-                                : "=r"(flags), "=r" (tmp)       \
+                      " nop                     \n"
-                                : "i"(~MSR_IE)                  \
+                      " andi    %1, %0, %2      \n"
-                                : "memory");                    \
+                      " mts     rmsr, %1        \n"
-        } while (0)
+                      " nop                     \n"
+                      : "=r"(flags), "=r"(tmp)
-# define raw_local_irq_disable()                                \
+                      : "i"(~MSR_IE)
-        do {                                                    \
+                      : "memory");
-                register unsigned tmp;                          \
+        return flags;
-                asm volatile (" mfs     %0, rmsr;               \
+}
-                                nop;                            \
-                                andi    %0, %0, %1;             \
+static inline void arch_local_irq_disable(void)
-                                mts     rmsr, %0;               \
+{
-                                nop;"                   \
+        unsigned long tmp;
-                                : "=r"(tmp)                     \
+        asm volatile("  mfs     %0, rmsr        \n"
-                                : "i"(~MSR_IE)                  \
+                     "  nop                     \n"
-                                : "memory");                    \
+                     "  andi    %0, %0, %1      \n"
-        } while (0)
+                     "  mts     rmsr, %0        \n"
+                     "  nop                     \n"
-# define raw_local_irq_enable()                                 \
+                     : "=r"(tmp)
-        do {                                                    \
+                     : "i"(~MSR_IE)
-                register unsigned tmp;                          \
+                     : "memory");
-                asm volatile (" mfs     %0, rmsr;               \
+}
-                                nop;                            \
-                                ori     %0, %0, %1;             \
+static inline void arch_local_irq_enable(void)
-                                mts     rmsr, %0;               \
+{
-                                nop;"                           \
+        unsigned long tmp;
-                                : "=r"(tmp)                     \
+        asm volatile("  mfs     %0, rmsr        \n"
-                                : "i"(MSR_IE)                   \
+                     "  nop                     \n"
-                                : "memory");                    \
+                     "  ori     %0, %0, %1      \n"
-        } while (0)
+                     "  mts     rmsr, %0        \n"
+                     "  nop                     \n"
-# endif /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
+                     : "=r"(tmp)
+                     : "i"(MSR_IE)
-#define raw_local_irq_restore(flags)                            \
+                     : "memory");
-        do {                                                    \
+}
-                asm volatile (" mts     rmsr, %0;               \
-                                nop;"                           \
+#endif /* CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR */
-                                :                               \
-                                : "r"(flags)                    \
+static inline unsigned long arch_local_save_flags(void)
-                                : "memory");                    \
-        } while (0)
-static inline unsigned long get_msr(void)
 {
        unsigned long flags;
-        asm volatile (" mfs     %0, rmsr;       \
+        asm volatile("  mfs     %0, rmsr        \n"
-                        nop;"                   \
+                     "  nop                     \n"
-                        : "=r"(flags)           \
+                     : "=r"(flags)
-                        :                       \
+                     :
-                        : "memory");            \
+                     : "memory");
        return flags;
 }
-#define raw_local_save_flags(flags)     ((flags) = get_msr())
+static inline void arch_local_irq_restore(unsigned long flags)
-#define raw_irqs_disabled()             ((get_msr() & MSR_IE) == 0)
+{
-#define raw_irqs_disabled_flags(flags)  ((flags & MSR_IE) == 0)
+        asm volatile("  mts     rmsr, %0        \n"
+                     "  nop                     \n"
+                     :
+                     : "r"(flags)
+                     : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & MSR_IE) == 0;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
 #endif /* _ASM_MICROBLAZE_IRQFLAGS_H */
diff --git a/arch/mips/alchemy/devboards/bcsr.c b/arch/mips/alchemy/devboards/bcsr.c
index 3bc4fd2155d..c52af8821da 100644
--- a/arch/mips/alchemy/devboards/bcsr.c
+++ b/arch/mips/alchemy/devboards/bcsr.c
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/irq.h>
 #include <asm/addrspace.h>
 #include <asm/io.h>
 #include <asm/mach-db1x00/bcsr.h>
diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c
index c781556c44e..4ec2642c568 100644
--- a/arch/mips/ar7/irq.c
+++ b/arch/mips/ar7/irq.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c
index a0c5cd18c19..3be87f2422f 100644
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
 #include <bcm63xx_cpu.h>
diff --git a/arch/mips/cavium-octeon/serial.c b/arch/mips/cavium-octeon/serial.c
index 638adab0284..12dbf533b77 100644
--- a/arch/mips/cavium-octeon/serial.c
+++ b/arch/mips/cavium-octeon/serial.c
@@ -13,6 +13,7 @@
 #include <linux/serial_8250.h>
 #include <linux/serial_reg.h>
 #include <linux/tty.h>
+#include <linux/irq.h>
 #include <asm/time.h>
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index bd5431e1f40..fa45e924be0 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -18,6 +18,7 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/pm.h>
+#include <linux/irq.h>
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
diff --git a/arch/mips/include/asm/irqflags.h b/arch/mips/include/asm/irqflags.h
index 701ec0ba8fa..9ef3b0d1789 100644
--- a/arch/mips/include/asm/irqflags.h
+++ b/arch/mips/include/asm/irqflags.h
@@ -17,7 +17,7 @@
 #include <asm/hazards.h>
 __asm__(
-        "       .macro  raw_local_irq_enable                            \n"
+        "       .macro  arch_local_irq_enable                           \n"
        "       .set    push                                            \n"
        "       .set    reorder                                         \n"
        "       .set    noat                                            \n"
@@ -40,7 +40,7 @@ __asm__(
 extern void smtc_ipi_replay(void);
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_enable(void)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
        /*
@@ -50,7 +50,7 @@ static inline void raw_local_irq_enable(void)
        smtc_ipi_replay();
 #endif
        __asm__ __volatile__(
-                "raw_local_irq_enable"
+                "arch_local_irq_enable"
                : /* no outputs */
                : /* no inputs */
                : "memory");
@@ -76,7 +76,7 @@ static inline void raw_local_irq_enable(void)
 * Workaround: mask EXL bit of the result or place a nop before mfc0.
 */
 __asm__(
-        "       .macro  raw_local_irq_disable\n"
+        "       .macro  arch_local_irq_disable\n"
        "       .set    push                                            \n"
        "       .set    noat                                            \n"
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -97,17 +97,17 @@ __asm__(
        "       .set    pop                                             \n"
        "       .endm                                                   \n");
-static inline void raw_local_irq_disable(void)
+static inline void arch_local_irq_disable(void)
 {
        __asm__ __volatile__(
-                "raw_local_irq_disable"
+                "arch_local_irq_disable"
                : /* no outputs */
                : /* no inputs */
                : "memory");
 }
 __asm__(
-        "       .macro  raw_local_save_flags flags                      \n"
+        "       .macro  arch_local_save_flags flags                     \n"
        "       .set    push                                            \n"
        "       .set    reorder                                         \n"
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -118,13 +118,15 @@ __asm__(
        "       .set    pop                                             \n"
        "       .endm                                                   \n");
-#define raw_local_save_flags(x)                                         \
+static inline unsigned long arch_local_save_flags(void)
-__asm__ __volatile__(                                                   \
+{
-        "raw_local_save_flags %0"                                       \
+        unsigned long flags;
-        : "=r" (x))
+        asm volatile("arch_local_save_flags %0" : "=r" (flags));
+        return flags;
+}
 __asm__(
-        "       .macro  raw_local_irq_save result                       \n"
+        "       .macro  arch_local_irq_save result                      \n"
        "       .set    push                                            \n"
        "       .set    reorder                                         \n"
        "       .set    noat                                            \n"
@@ -148,15 +150,18 @@ __asm__(
        "       .set    pop                                             \n"
        "       .endm                                                   \n");
-#define raw_local_irq_save(x)                                           \
+static inline unsigned long arch_local_irq_save(void)
-__asm__ __volatile__(                                                   \
+{
-        "raw_local_irq_save\t%0"                                        \
+        unsigned long flags;
-        : "=r" (x)                                                      \
+        asm volatile("arch_local_irq_save\t%0"
-        : /* no inputs */                                               \
+                     : "=r" (flags)
-        : "memory")
+                     : /* no inputs */
+                     : "memory");
+        return flags;
+}
 __asm__(
-        "       .macro  raw_local_irq_restore flags                     \n"
+        "       .macro  arch_local_irq_restore flags                    \n"
        "       .set    push                                            \n"
        "       .set    noreorder                                       \n"
        "       .set    noat                                            \n"
@@ -196,7 +201,7 @@ __asm__(
        "       .endm                                                   \n");
-static inline void raw_local_irq_restore(unsigned long flags)
+static inline void arch_local_irq_restore(unsigned long flags)
 {
        unsigned long __tmp1;
@@ -211,24 +216,24 @@ static inline void raw_local_irq_restore(unsigned long flags)
 #endif
        __asm__ __volatile__(
-                "raw_local_irq_restore\t%0"
+                "arch_local_irq_restore\t%0"
                : "=r" (__tmp1)
                : "0" (flags)
                : "memory");
 }
-static inline void __raw_local_irq_restore(unsigned long flags)
+static inline void __arch_local_irq_restore(unsigned long flags)
 {
        unsigned long __tmp1;
        __asm__ __volatile__(
-                "raw_local_irq_restore\t%0"
+                "arch_local_irq_restore\t%0"
                : "=r" (__tmp1)
                : "0" (flags)
                : "memory");
 }
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline int arch_irqs_disabled_flags(unsigned long flags)
 {
 #ifdef CONFIG_MIPS_MT_SMTC
        /*
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index cb6985f2430..1e29b9dd1d7 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -13,6 +13,7 @@
 #include <linux/io.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 /* loongson internal northbridge initialization */
 extern void bonito_irq_init(void);
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index ee18028efe9..35b3e2f0af0 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/smp.h>
 #include <linux/spinlock.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/i8253.h>
diff --git a/arch/mips/kernel/cevt-bcm1480.c b/arch/mips/kernel/cevt-bcm1480.c
index bfea327c636..36c3898b76d 100644
--- a/arch/mips/kernel/cevt-bcm1480.c
+++ b/arch/mips/kernel/cevt-bcm1480.c
@@ -19,6 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
+#include <linux/irq.h>
 #include <asm/addrspace.h>
 #include <asm/io.h>
diff --git a/arch/mips/kernel/cevt-ds1287.c b/arch/mips/kernel/cevt-ds1287.c
index 00a4da277cb..939157e397b 100644
--- a/arch/mips/kernel/cevt-ds1287.c
+++ b/arch/mips/kernel/cevt-ds1287.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
+#include <linux/irq.h>
 #include <asm/time.h>
diff --git a/arch/mips/kernel/cevt-gt641xx.c b/arch/mips/kernel/cevt-gt641xx.c
index 392ef3756c5..339f3639b90 100644
--- a/arch/mips/kernel/cevt-gt641xx.c
+++ b/arch/mips/kernel/cevt-gt641xx.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/irq.h>
 #include <asm/gt64120.h>
 #include <asm/time.h>
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 2a4d50ff5e2..2f4d7a99bcc 100644
--- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
+#include <linux/irq.h>
 #include <asm/smtc_ipi.h>
 #include <asm/time.h>
diff --git a/arch/mips/kernel/cevt-sb1250.c b/arch/mips/kernel/cevt-sb1250.c
index da78eeaea6e..590c54f28a8 100644
--- a/arch/mips/kernel/cevt-sb1250.c
+++ b/arch/mips/kernel/cevt-sb1250.c
@@ -17,6 +17,7 @@
 */
 #include <linux/clockchips.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
diff --git a/arch/mips/kernel/cevt-smtc.c b/arch/mips/kernel/cevt-smtc.c
index b102e4f1630..2e72d30b2f0 100644
--- a/arch/mips/kernel/cevt-smtc.c
+++ b/arch/mips/kernel/cevt-smtc.c
@@ -11,6 +11,7 @@
 #include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
+#include <linux/irq.h>
 #include <asm/smtc_ipi.h>
 #include <asm/time.h>
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c
index 218ee6bda93..0b7377361e2 100644
--- a/arch/mips/kernel/cevt-txx9.c
+++ b/arch/mips/kernel/cevt-txx9.c
@@ -13,6 +13,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/time.h>
 #include <asm/txx9tmr.h>
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
index 94794062a17..2392a7a296d 100644
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/i8253.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/spinlock.h>
+#include <linux/irq.h>
 #include <asm/delay.h>
 #include <asm/i8253.h>
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 27799113332..c58176cc796 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/sysdev.h>
+#include <linux/irq.h>
 #include <asm/i8259.h>
 #include <asm/io.h>
diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c
index 82ba9f62f49..1774271af84 100644
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
@@ -3,11 +3,11 @@
 #include <linux/bitmap.h>
 #include <linux/init.h>
 #include <linux/smp.h>
+#include <linux/irq.h>
 #include <asm/io.h>
 #include <asm/gic.h>
 #include <asm/gcmpregs.h>
-#include <asm/irq.h>
 #include <linux/hardirq.h>
 #include <asm-generic/bitops/find.h>
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index fb50cc78b28..9731e8b4786 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -11,6 +11,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <asm/irq_cpu.h>
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c
index b47e4615ec1..b7e4025b58a 100644
--- a/arch/mips/kernel/irq-rm9000.c
+++ b/arch/mips/kernel/irq-rm9000.c
@@ -11,6 +11,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c
index 55c8a3ca507..0262abe0912 100644
--- a/arch/mips/kernel/irq_cpu.c
+++ b/arch/mips/kernel/irq_cpu.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c
index 9b78029bea7..95a96f69172 100644
--- a/arch/mips/kernel/irq_txx9.c
+++ b/arch/mips/kernel/irq_txx9.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/types.h>
+#include <linux/irq.h>
 #include <asm/txx9irq.h>
 struct txx9_irc_reg {
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index cfeb2c15589..39c08254b0f 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1038,7 +1038,7 @@ void deferred_smtc_ipi(void)
                 * but it's more efficient, given that we're already
                 * running down the IPI queue.
                 */
-                __raw_local_irq_restore(flags);
+                __arch_local_irq_restore(flags);
        }
 }
@@ -1190,7 +1190,7 @@ void smtc_ipi_replay(void)
                /*
                 ** But use a raw restore here to avoid recursion.
                 */
-                __raw_local_irq_restore(flags);
+                __arch_local_irq_restore(flags);
                if (pipi) {
                        self_ipi(pipi);
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 03ec0019032..d053bf4759e 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -28,6 +28,7 @@
 #include <linux/kprobes.h>
 #include <linux/notifier.h>
 #include <linux/kdb.h>
+#include <linux/irq.h>
 #include <asm/bootinfo.h>
 #include <asm/branch.h>
@@ -51,7 +52,6 @@
 #include <asm/mmu_context.h>
 #include <asm/types.h>
 #include <asm/stacktrace.h>
-#include <asm/irq.h>
 #include <asm/uasm.h>
 extern void check_wait(void);
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
index 72e32a7715b..4c35301720e 100644
--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
@@ -25,6 +25,7 @@
 #include <linux/serial_8250.h>
 #include <linux/mc146818rtc.h>
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index 31c15019659..6a3bdb5ffa8 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -38,6 +38,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/addrspace.h>
 #include <asm/txx9irq.h>
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c
index 5989e747527..a1e7e6d80c8 100644
--- a/arch/mips/pci/ops-tx4927.c
+++ b/arch/mips/pci/ops-tx4927.c
@@ -17,6 +17,7 @@
 */
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/txx9/pci.h>
 #include <asm/txx9/tx4927pcic.h>
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
index 94c9c2c9fbc..07e71ff2433 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <linux/irq.h>
 #include <asm/system.h>
diff --git a/arch/mips/powertv/asic/irq_asic.c b/arch/mips/powertv/asic/irq_asic.c
index b54d24499b0..e5538243415 100644
--- a/arch/mips/powertv/asic/irq_asic.c
+++ b/arch/mips/powertv/asic/irq_asic.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c
index 00ed19f0bdb..70482540b3d 100644
--- a/arch/mips/rb532/serial.c
+++ b/arch/mips/rb532/serial.c
@@ -29,6 +29,7 @@
 #include <linux/tty.h>
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
+#include <linux/irq.h>
 #include <asm/serial.h>
 #include <asm/mach-rc32434/rb.h>
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index e6980892834..bbe7187879f 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
index 51e62bbaa23..8c92c73bc71 100644
--- a/arch/mips/sni/pcimt.c
+++ b/arch/mips/sni/pcimt.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
index f4699d35858..dc9874553be 100644
--- a/arch/mips/sni/pcit.c
+++ b/arch/mips/sni/pcit.c
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
index 90c558f7c0f..0e6f42c2bbc 100644
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/io.h>
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index f3b60e67120..c76151b5656 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -1,5 +1,6 @@
 #include <linux/types.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/smp.h>
 #include <linux/time.h>
 #include <linux/clockchips.h>
diff --git a/arch/mips/txx9/generic/irq_tx4927.c b/arch/mips/txx9/generic/irq_tx4927.c
index ad2870def8f..e1828e8bcae 100644
--- a/arch/mips/txx9/generic/irq_tx4927.c
+++ b/arch/mips/txx9/generic/irq_tx4927.c
@@ -25,6 +25,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/txx9/tx4927.h>
diff --git a/arch/mips/txx9/generic/irq_tx4938.c b/arch/mips/txx9/generic/irq_tx4938.c
index 025ae11359a..a6e6e805097 100644
--- a/arch/mips/txx9/generic/irq_tx4938.c
+++ b/arch/mips/txx9/generic/irq_tx4938.c
@@ -13,6 +13,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/txx9/tx4938.h>
diff --git a/arch/mips/txx9/generic/irq_tx4939.c b/arch/mips/txx9/generic/irq_tx4939.c
index 013213a8706..3886ad77cba 100644
--- a/arch/mips/txx9/generic/irq_tx4939.c
+++ b/arch/mips/txx9/generic/irq_tx4939.c
@@ -19,6 +19,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/types.h>
 #include <asm/irq_cpu.h>
 #include <asm/txx9irq.h>
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 575d219b800..812816c4566 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -24,6 +24,7 @@
 #include <linux/leds.h>
 #include <linux/sysdev.h>
 #include <linux/slab.h>
+#include <linux/irq.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
 #include <asm/reboot.h>
diff --git a/arch/mips/txx9/jmr3927/irq.c b/arch/mips/txx9/jmr3927/irq.c
index 6ec626c9473..0a7f8e3b9fd 100644
--- a/arch/mips/txx9/jmr3927/irq.c
+++ b/arch/mips/txx9/jmr3927/irq.c
@@ -32,6 +32,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
diff --git a/arch/mips/txx9/rbtx4927/irq.c b/arch/mips/txx9/rbtx4927/irq.c
index 9c14ebb26cb..c4b54d20efd 100644
--- a/arch/mips/txx9/rbtx4927/irq.c
+++ b/arch/mips/txx9/rbtx4927/irq.c
@@ -111,6 +111,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/txx9/generic.h>
diff --git a/arch/mips/txx9/rbtx4938/irq.c b/arch/mips/txx9/rbtx4938/irq.c
index 7d21befb893..67a73a8065e 100644
--- a/arch/mips/txx9/rbtx4938/irq.c
+++ b/arch/mips/txx9/rbtx4938/irq.c
@@ -64,6 +64,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/mipsregs.h>
 #include <asm/txx9/generic.h>
 #include <asm/txx9/rbtx4938.h>
diff --git a/arch/mips/txx9/rbtx4939/irq.c b/arch/mips/txx9/rbtx4939/irq.c
index 500cc0a908e..57fa740a720 100644
--- a/arch/mips/txx9/rbtx4939/irq.c
+++ b/arch/mips/txx9/rbtx4939/irq.c
@@ -11,6 +11,7 @@
 */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <asm/mipsregs.h>
 #include <asm/txx9/rbtx4939.h>
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index bef06872f01..0975eb72d38 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -19,6 +19,7 @@
 */
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/system.h>
diff --git a/arch/mips/vr41xx/common/siu.c b/arch/mips/vr41xx/common/siu.c
index 54eae56108f..bbd45d2559d 100644
--- a/arch/mips/vr41xx/common/siu.c
+++ b/arch/mips/vr41xx/common/siu.c
@@ -22,6 +22,7 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
+#include <linux/irq.h>
 #include <asm/cpu.h>
 #include <asm/vr41xx/siu.h>
diff --git a/arch/mn10300/include/asm/irqflags.h b/arch/mn10300/include/asm/irqflags.h
new file mode 100644
index 00000000000..5e529a117cb
--- /dev/null
+++ b/arch/mn10300/include/asm/irqflags.h
@@ -0,0 +1,123 @@
+/* MN10300 IRQ flag handling
+ *
+ * Copyright (C) 2010 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _ASM_IRQFLAGS_H
+#define _ASM_IRQFLAGS_H
+#include <asm/cpu-regs.h>
+/*
+ * interrupt control
+ * - "disabled": run in IM1/2
+ *   - level 0 - GDB stub
+ *   - level 1 - virtual serial DMA (if present)
+ *   - level 5 - normal interrupt priority
+ *   - level 6 - timer interrupt
+ * - "enabled":  run in IM7
+ */
+#ifdef CONFIG_MN10300_TTYSM
+#define MN10300_CLI_LEVEL       EPSW_IM_2
+#else
+#define MN10300_CLI_LEVEL       EPSW_IM_1
+#endif
+#ifndef __ASSEMBLY__
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("mov epsw,%0" : "=d"(flags));
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+        asm volatile(
+                "       and %0,epsw     \n"
+                "       or %1,epsw      \n"
+                "       nop             \n"
+                "       nop             \n"
+                "       nop             \n"
+                :
+                : "i"(~EPSW_IM), "i"(EPSW_IE | MN10300_CLI_LEVEL)
+                : "memory");
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags;
+        flags = arch_local_save_flags();
+        arch_local_irq_disable();
+        return flags;
+}
+/*
+ * we make sure arch_irq_enable() doesn't cause priority inversion
+ */
+extern unsigned long __mn10300_irq_enabled_epsw;
+static inline void arch_local_irq_enable(void)
+{
+        unsigned long tmp;
+        asm volatile(
+                "       mov     epsw,%0         \n"
+                "       and     %1,%0           \n"
+                "       or      %2,%0           \n"
+                "       mov     %0,epsw         \n"
+                : "=&d"(tmp)
+                : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw)
+                : "memory");
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile(
+                "       mov %0,epsw     \n"
+                "       nop             \n"
+                "       nop             \n"
+                "       nop             \n"
+                :
+                : "d"(flags)
+                : "memory", "cc");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & EPSW_IM) <= MN10300_CLI_LEVEL;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+/*
+ * Hook to save power by halting the CPU
+ * - called from the idle loop
+ * - must reenable interrupts (which takes three instruction cycles to complete)
+ */
+static inline void arch_safe_halt(void)
+{
+        asm volatile(
+                "       or      %0,epsw \n"
+                "       nop             \n"
+                "       nop             \n"
+                "       bset    %2,(%1) \n"
+                :
+                : "i"(EPSW_IE|EPSW_IM), "n"(&CPUM), "i"(CPUM_SLEEP)
+                : "cc");
+}
+#endif /* __ASSEMBLY__ */
+#endif /* _ASM_IRQFLAGS_H */
diff --git a/arch/mn10300/include/asm/system.h b/arch/mn10300/include/asm/system.h
index 3636c054dcd..9f7c7e17c01 100644
--- a/arch/mn10300/include/asm/system.h
+++ b/arch/mn10300/include/asm/system.h
@@ -17,6 +17,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/kernel.h>
+#include <linux/irqflags.h>
 struct task_struct;
 struct thread_struct;
@@ -81,114 +82,6 @@ do {									\
 /*****************************************************************************/
 /*
- * interrupt control
- * - "disabled": run in IM1/2
- *   - level 0 - GDB stub
- *   - level 1 - virtual serial DMA (if present)
- *   - level 5 - normal interrupt priority
- *   - level 6 - timer interrupt
- * - "enabled":  run in IM7
- */
-#ifdef CONFIG_MN10300_TTYSM
-#define MN10300_CLI_LEVEL       EPSW_IM_2
-#else
-#define MN10300_CLI_LEVEL       EPSW_IM_1
-#endif
-#define local_save_flags(x)                     \
-do {                                            \
-        typecheck(unsigned long, x);            \
-        asm volatile(                           \
-                "       mov epsw,%0     \n"     \
-                : "=d"(x)                       \
-                );                              \
-} while (0)
-#define local_irq_disable()                                             \
-do {                                                                    \
-        asm volatile(                                                   \
-                "       and %0,epsw     \n"                             \
-                "       or %1,epsw      \n"                             \
-                "       nop             \n"                             \
-                "       nop             \n"                             \
-                "       nop             \n"                             \
-                :                                                       \
-                : "i"(~EPSW_IM), "i"(EPSW_IE | MN10300_CLI_LEVEL)       \
-                );                                                      \
-} while (0)
-#define local_irq_save(x)                       \
-do {                                            \
-        local_save_flags(x);                    \
-        local_irq_disable();                    \
-} while (0)
-/*
- * we make sure local_irq_enable() doesn't cause priority inversion
- */
-#ifndef __ASSEMBLY__
-extern unsigned long __mn10300_irq_enabled_epsw;
-#endif
-#define local_irq_enable()                                              \
-do {                                                                    \
-        unsigned long tmp;                                              \
-                                                                        \
-        asm volatile(                                                   \
-                "       mov     epsw,%0         \n"                     \
-                "       and     %1,%0           \n"                     \
-                "       or      %2,%0           \n"                     \
-                "       mov     %0,epsw         \n"                     \
-                : "=&d"(tmp)                                            \
-                : "i"(~EPSW_IM), "r"(__mn10300_irq_enabled_epsw)        \
-                : "cc"                                                  \
-                );                                                      \
-} while (0)
-#define local_irq_restore(x)                    \
-do {                                            \
-        typecheck(unsigned long, x);            \
-        asm volatile(                           \
-                "       mov %0,epsw     \n"     \
-                "       nop             \n"     \
-                "       nop             \n"     \
-                "       nop             \n"     \
-                :                               \
-                : "d"(x)                        \
-                : "memory", "cc"                \
-                );                              \
-} while (0)
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long flags;                    \
-        local_save_flags(flags);                \
-        (flags & EPSW_IM) <= MN10300_CLI_LEVEL; \
-})
-/* hook to save power by halting the CPU
- * - called from the idle loop
- * - must reenable interrupts (which takes three instruction cycles to complete)
- */
-#define safe_halt()                                                     \
-do {                                                                    \
-        asm volatile("  or      %0,epsw \n"                             \
-                     "  nop             \n"                             \
-                     "  nop             \n"                             \
-                     "  bset    %2,(%1) \n"                             \
-                     :                                                  \
-                     : "i"(EPSW_IE|EPSW_IM), "n"(&CPUM), "i"(CPUM_SLEEP)\
-                     : "cc"                                             \
-                     );                                                 \
-} while (0)
-#define STI     or EPSW_IE|EPSW_IM,epsw
-#define CLI     and ~EPSW_IM,epsw; or EPSW_IE|MN10300_CLI_LEVEL,epsw; nop; nop; nop
-/*****************************************************************************/
-/*
 * MN10300 doesn't actually have an exchange instruction
 */
 #ifndef __ASSEMBLY__
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index d9ed5a15c54..3d394b4eefb 100644
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -16,6 +16,7 @@
 #include <linux/linkage.h>
 #include <asm/smp.h>
 #include <asm/system.h>
+#include <asm/irqflags.h>
 #include <asm/thread_info.h>
 #include <asm/intctl-regs.h>
 #include <asm/busctl-regs.h>
diff --git a/arch/parisc/include/asm/irqflags.h b/arch/parisc/include/asm/irqflags.h
new file mode 100644
index 00000000000..34f9cb9b475
--- /dev/null
+++ b/arch/parisc/include/asm/irqflags.h
@@ -0,0 +1,46 @@
+#ifndef __PARISC_IRQFLAGS_H
+#define __PARISC_IRQFLAGS_H
+#include <linux/types.h>
+#include <asm/psw.h>
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("ssm 0, %0" : "=r" (flags) : : "memory");
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+        asm volatile("rsm %0,%%r0\n" : : "i" (PSW_I) : "memory");
+}
+static inline void arch_local_irq_enable(void)
+{
+        asm volatile("ssm %0,%%r0\n" : : "i" (PSW_I) : "memory");
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags;
+        asm volatile("rsm %1,%0" : "=r" (flags) : "i" (PSW_I) : "memory");
+        return flags;
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile("mtsm %0" : : "r" (flags) : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & PSW_I) == 0;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* __PARISC_IRQFLAGS_H */
diff --git a/arch/parisc/include/asm/system.h b/arch/parisc/include/asm/system.h
index 2ab4af58ecb..b19e63a8e84 100644
--- a/arch/parisc/include/asm/system.h
+++ b/arch/parisc/include/asm/system.h
@@ -1,7 +1,7 @@
 #ifndef __PARISC_SYSTEM_H
 #define __PARISC_SYSTEM_H
-#include <asm/psw.h>
+#include <linux/irqflags.h>
 /* The program status word as bitfields.  */
 struct pa_psw {
@@ -48,23 +48,6 @@ extern struct task_struct *_switch_to(struct task_struct *, struct task_struct *
        (last) = _switch_to(prev, next);                        \
 } while(0)
-/* interrupt control */
-#define local_save_flags(x)     __asm__ __volatile__("ssm 0, %0" : "=r" (x) : : "memory")
-#define local_irq_disable()     __asm__ __volatile__("rsm %0,%%r0\n" : : "i" (PSW_I) : "memory" )
-#define local_irq_enable()      __asm__ __volatile__("ssm %0,%%r0\n" : : "i" (PSW_I) : "memory" )
-#define local_irq_save(x) \
-        __asm__ __volatile__("rsm %1,%0" : "=r" (x) :"i" (PSW_I) : "memory" )
-#define local_irq_restore(x) \
-        __asm__ __volatile__("mtsm %0" : : "r" (x) : "memory" )
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        (flags & PSW_I) == 0;           \
-})
 #define mfctl(reg)      ({              \
        unsigned long cr;               \
        __asm__ __volatile__(           \
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index bd100fcf40d..ff08b70b36d 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -16,42 +16,57 @@ extern void timer_interrupt(struct pt_regs *);
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
-static inline unsigned long local_get_flags(void)
+static inline unsigned long arch_local_save_flags(void)
 {
        unsigned long flags;
-        __asm__ __volatile__("lbz %0,%1(13)"
+        asm volatile(
-        : "=r" (flags)
+                "lbz %0,%1(13)"
-        : "i" (offsetof(struct paca_struct, soft_enabled)));
+                : "=r" (flags)
+                : "i" (offsetof(struct paca_struct, soft_enabled)));
        return flags;
 }
-static inline unsigned long raw_local_irq_disable(void)
+static inline unsigned long arch_local_irq_disable(void)
 {
        unsigned long flags, zero;
-        __asm__ __volatile__("li %1,0; lbz %0,%2(13); stb %1,%2(13)"
+        asm volatile(
-        : "=r" (flags), "=&r" (zero)
+                "li %1,0; lbz %0,%2(13); stb %1,%2(13)"
-        : "i" (offsetof(struct paca_struct, soft_enabled))
+                : "=r" (flags), "=&r" (zero)
-        : "memory");
+                : "i" (offsetof(struct paca_struct, soft_enabled))
+                : "memory");
        return flags;
 }
-extern void raw_local_irq_restore(unsigned long);
+extern void arch_local_irq_restore(unsigned long);
 extern void iseries_handle_interrupts(void);
-#define raw_local_irq_enable()          raw_local_irq_restore(1)
+static inline void arch_local_irq_enable(void)
-#define raw_local_save_flags(flags)     ((flags) = local_get_flags())
+{
-#define raw_local_irq_save(flags)       ((flags) = raw_local_irq_disable())
+        arch_local_irq_restore(1);
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        return arch_local_irq_disable();
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return flags == 0;
+}
-#define raw_irqs_disabled()             (local_get_flags() == 0)
+static inline bool arch_irqs_disabled(void)
-#define raw_irqs_disabled_flags(flags)  ((flags) == 0)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
 #ifdef CONFIG_PPC_BOOK3E
-#define __hard_irq_enable()     __asm__ __volatile__("wrteei 1": : :"memory");
+#define __hard_irq_enable()     asm volatile("wrteei 1" : : : "memory");
-#define __hard_irq_disable()    __asm__ __volatile__("wrteei 0": : :"memory");
+#define __hard_irq_disable()    asm volatile("wrteei 0" : : : "memory");
 #else
 #define __hard_irq_enable()     __mtmsrd(mfmsr() | MSR_EE, 1)
 #define __hard_irq_disable()    __mtmsrd(mfmsr() & ~MSR_EE, 1)
@@ -64,64 +79,66 @@ extern void iseries_handle_interrupts(void);
                get_paca()->hard_enabled = 0;   \
        } while(0)
-#else
+#else /* CONFIG_PPC64 */
-#if defined(CONFIG_BOOKE)
 #define SET_MSR_EE(x)   mtmsr(x)
-#define raw_local_irq_restore(flags)    __asm__ __volatile__("wrtee %0" : : "r" (flags) : "memory")
+static inline unsigned long arch_local_save_flags(void)
+{
+        return mfmsr();
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+#if defined(CONFIG_BOOKE)
+        asm volatile("wrtee %0" : : "r" (flags) : "memory");
 #else
-#define SET_MSR_EE(x)   mtmsr(x)
+        mtmsr(flags);
-#define raw_local_irq_restore(flags)    mtmsr(flags)
 #endif
+}
-static inline void raw_local_irq_disable(void)
+static inline unsigned long arch_local_irq_save(void)
 {
+        unsigned long flags = arch_local_save_flags();
 #ifdef CONFIG_BOOKE
-        __asm__ __volatile__("wrteei 0": : :"memory");
+        asm volatile("wrteei 0" : : : "memory");
 #else
-        unsigned long msr;
+        SET_MSR_EE(flags & ~MSR_EE);
-        msr = mfmsr();
-        SET_MSR_EE(msr & ~MSR_EE);
 #endif
+        return flags;
 }
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_disable(void)
 {
 #ifdef CONFIG_BOOKE
-        __asm__ __volatile__("wrteei 1": : :"memory");
+        asm volatile("wrteei 0" : : : "memory");
 #else
-        unsigned long msr;
+        arch_local_irq_save();
-        msr = mfmsr();
-        SET_MSR_EE(msr | MSR_EE);
 #endif
 }
-static inline void raw_local_irq_save_ptr(unsigned long *flags)
+static inline void arch_local_irq_enable(void)
 {
-        unsigned long msr;
-        msr = mfmsr();
-        *flags = msr;
 #ifdef CONFIG_BOOKE
-        __asm__ __volatile__("wrteei 0": : :"memory");
+        asm volatile("wrteei 1" : : : "memory");
 #else
-        SET_MSR_EE(msr & ~MSR_EE);
+        unsigned long msr = mfmsr();
+        SET_MSR_EE(msr | MSR_EE);
 #endif
 }
-#define raw_local_save_flags(flags)     ((flags) = mfmsr())
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
-#define raw_local_irq_save(flags)       raw_local_irq_save_ptr(&flags)
-#define raw_irqs_disabled()             ((mfmsr() & MSR_EE) == 0)
-#define raw_irqs_disabled_flags(flags)  (((flags) & MSR_EE) == 0)
-#define hard_irq_disable()              raw_local_irq_disable()
-static inline int irqs_disabled_flags(unsigned long flags)
 {
        return (flags & MSR_EE) == 0;
 }
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#define hard_irq_disable()              arch_local_irq_disable()
 #endif /* CONFIG_PPC64 */
 /*
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
index 5f68ecfdf51..b85d8ddbb66 100644
--- a/arch/powerpc/include/asm/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -6,7 +6,7 @@
 #ifndef __ASSEMBLY__
 /*
- * Get definitions for raw_local_save_flags(x), etc.
+ * Get definitions for arch_local_save_flags(x), etc.
 */
 #include <asm/hw_irq.h>
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index f53029a0155..39b0c48872d 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -818,12 +818,12 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
        /*
         * hash_page couldn't handle it, set soft interrupt enable back
-         * to what it was before the trap.  Note that .raw_local_irq_restore
+         * to what it was before the trap.  Note that .arch_local_irq_restore
         * handles any interrupts pending at this point.
         */
        ld      r3,SOFTE(r1)
        TRACE_AND_RESTORE_IRQ_PARTIAL(r3, 11f)
-        bl      .raw_local_irq_restore
+        bl      .arch_local_irq_restore
        b       11f
 /* We have a data breakpoint exception - handle it */
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 4a65386995d..1903290f546 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -116,7 +116,7 @@ static inline notrace void set_soft_enabled(unsigned long enable)
        : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
 }
-notrace void raw_local_irq_restore(unsigned long en)
+notrace void arch_local_irq_restore(unsigned long en)
 {
        /*
         * get_paca()->soft_enabled = en;
@@ -192,7 +192,7 @@ notrace void raw_local_irq_restore(unsigned long en)
        __hard_irq_enable();
 }
-EXPORT_SYMBOL(raw_local_irq_restore);
+EXPORT_SYMBOL(arch_local_irq_restore);
 #endif /* CONFIG_PPC64 */
 static int show_other_interrupts(struct seq_file *p, int prec)
diff --git a/arch/s390/include/asm/irqflags.h b/arch/s390/include/asm/irqflags.h
index 15b3ac25389..865d6d891ac 100644
--- a/arch/s390/include/asm/irqflags.h
+++ b/arch/s390/include/asm/irqflags.h
@@ -8,8 +8,8 @@
 #include <linux/types.h>
-/* store then or system mask. */
+/* store then OR system mask. */
-#define __raw_local_irq_stosm(__or)                                     \
+#define __arch_local_irq_stosm(__or)                                    \
 ({                                                                      \
        unsigned long __mask;                                           \
        asm volatile(                                                   \
@@ -18,8 +18,8 @@
        __mask;                                                         \
 })
-/* store then and system mask. */
+/* store then AND system mask. */
-#define __raw_local_irq_stnsm(__and)                                    \
+#define __arch_local_irq_stnsm(__and)                                   \
 ({                                                                      \
        unsigned long __mask;                                           \
        asm volatile(                                                   \
@@ -29,39 +29,44 @@
 })
 /* set system mask. */
-#define __raw_local_irq_ssm(__mask)                                     \
+static inline void __arch_local_irq_ssm(unsigned long flags)
-({                                                                      \
+{
-        asm volatile("ssm   %0" : : "Q" (__mask) : "memory");           \
+        asm volatile("ssm   %0" : : "Q" (flags) : "memory");
-})
+}
-/* interrupt control.. */
+static inline unsigned long arch_local_save_flags(void)
-static inline unsigned long raw_local_irq_enable(void)
 {
-        return __raw_local_irq_stosm(0x03);
+        return __arch_local_irq_stosm(0x00);
 }
-static inline unsigned long raw_local_irq_disable(void)
+static inline unsigned long arch_local_irq_save(void)
 {
-        return __raw_local_irq_stnsm(0xfc);
+        return __arch_local_irq_stnsm(0xfc);
 }
-#define raw_local_save_flags(x)                                         \
+static inline void arch_local_irq_disable(void)
-do {                                                                    \
+{
-        typecheck(unsigned long, x);                                    \
+        arch_local_irq_save();
-        (x) = __raw_local_irq_stosm(0x00);                              \
+}
-} while (0)
-static inline void raw_local_irq_restore(unsigned long flags)
+static inline void arch_local_irq_enable(void)
 {
-        __raw_local_irq_ssm(flags);
+        __arch_local_irq_stosm(0x03);
 }
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        __arch_local_irq_ssm(flags);
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
 {
        return !(flags & (3UL << (BITS_PER_LONG - 8)));
 }
-/* For spinlocks etc */
+static inline bool arch_irqs_disabled(void)
-#define raw_local_irq_save(x)   ((x) = raw_local_irq_disable())
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
 #endif /* __ASM_IRQFLAGS_H */
diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
index 38ddd8a9a9e..1f2ebc4afd8 100644
--- a/arch/s390/include/asm/system.h
+++ b/arch/s390/include/asm/system.h
@@ -398,7 +398,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
 static inline void
 __set_psw_mask(unsigned long mask)
 {
-        __load_psw_mask(mask | (__raw_local_irq_stosm(0x00) & ~(-1UL >> 8)));
+        __load_psw_mask(mask | (arch_local_save_flags() & ~(-1UL >> 8)));
 }
 #define local_mcck_enable()  __set_psw_mask(psw_kernel_bits)
diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c
index 559af0d0787..0fbe4e32f7b 100644
--- a/arch/s390/kernel/mem_detect.c
+++ b/arch/s390/kernel/mem_detect.c
@@ -54,11 +54,11 @@ void detect_memory_layout(struct mem_chunk chunk[])
         * right thing and we don't get scheduled away with low address
         * protection disabled.
         */
-        flags = __raw_local_irq_stnsm(0xf8);
+        flags = __arch_local_irq_stnsm(0xf8);
        __ctl_store(cr0, 0, 0);
        __ctl_clear_bit(0, 28);
        find_memory_chunks(chunk);
        __ctl_load(cr0, 0, 0);
-        __raw_local_irq_ssm(flags);
+        arch_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(detect_memory_layout);
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 30eb6d02ddb..94b8ba2ec85 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -50,7 +50,6 @@ EXPORT_SYMBOL(empty_zero_page);
 */
 void __init paging_init(void)
 {
-        static const int ssm_mask = 0x04000000L;
        unsigned long max_zone_pfns[MAX_NR_ZONES];
        unsigned long pgd_type;
@@ -72,7 +71,7 @@ void __init paging_init(void)
        __ctl_load(S390_lowcore.kernel_asce, 1, 1);
        __ctl_load(S390_lowcore.kernel_asce, 7, 7);
        __ctl_load(S390_lowcore.kernel_asce, 13, 13);
-        __raw_local_irq_ssm(ssm_mask);
+        arch_local_irq_restore(4UL << (BITS_PER_LONG - 8));
        atomic_set(&init_mm.context.attach_count, 1);
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
index a8c2af8c650..71a4b0d34be 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
@@ -71,7 +71,7 @@ int memcpy_real(void *dest, void *src, size_t count)
        if (!count)
                return 0;
-        flags = __raw_local_irq_stnsm(0xf8UL);
+        flags = __arch_local_irq_stnsm(0xf8UL);
        asm volatile (
                "0:     mvcle   %1,%2,0x0\n"
                "1:     jo      0b\n"
@@ -82,6 +82,6 @@ int memcpy_real(void *dest, void *src, size_t count)
                  "+d" (_len2), "=m" (*((long *) dest))
                : "m" (*((long *) src))
                : "cc", "memory");
-        __raw_local_irq_ssm(flags);
+        arch_local_irq_restore(flags);
        return rc;
 }
diff --git a/arch/score/include/asm/irqflags.h b/arch/score/include/asm/irqflags.h
index 690a6cae729..5c7563891e2 100644
--- a/arch/score/include/asm/irqflags.h
+++ b/arch/score/include/asm/irqflags.h
@@ -3,107 +3,118 @@
 #ifndef __ASSEMBLY__
-#define raw_local_irq_save(x)                   \
+#include <linux/types.h>
-{                                               \
-        __asm__ __volatile__(                   \
+static inline unsigned long arch_local_save_flags(void)
-                "mfcr   r8, cr0;"               \
+{
-                "li     r9, 0xfffffffe;"        \
+        unsigned long flags;
-                "nop;"                          \
-                "mv     %0, r8;"                \
+        asm volatile(
-                "and    r8, r8, r9;"            \
+                "       mfcr    r8, cr0         \n"
-                "mtcr   r8, cr0;"               \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       mv      %0, r8          \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                : "=r" (x)                      \
+                "       nop                     \n"
-                :                               \
+                "       nop                     \n"
-                : "r8", "r9"                    \
+                "       ldi     r9, 0x1         \n"
-                );                              \
+                "       and     %0, %0, r9      \n"
+                : "=r" (flags)
+                :
+                : "r8", "r9");
+        return flags;
 }
-#define raw_local_irq_restore(x)                \
+static inline unsigned long arch_local_irq_save(void)
-{                                               \
+{
-        __asm__ __volatile__(                   \
+        unsigned long flags
-                "mfcr   r8, cr0;"               \
-                "ldi    r9, 0x1;"               \
+        asm volatile(
-                "and    %0, %0, r9;"            \
+                "       mfcr    r8, cr0         \n"
-                "or     r8, r8, %0;"            \
+                "       li      r9, 0xfffffffe  \n"
-                "mtcr   r8, cr0;"               \
+                "       nop                     \n"
-                "nop;"                          \
+                "       mv      %0, r8          \n"
-                "nop;"                          \
+                "       and     r8, r8, r9      \n"
-                "nop;"                          \
+                "       mtcr    r8, cr0         \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                :                               \
+                "       nop                     \n"
-                : "r"(x)                        \
+                "       nop                     \n"
-                : "r8", "r9"                    \
+                "       nop                     \n"
-                );                              \
+                : "=r" (flags)
+                :
+                : "r8", "r9", "memory");
+        return flags;
 }
-#define raw_local_irq_enable(void)              \
+static inline void arch_local_irq_restore(unsigned long flags)
-{                                               \
+{
-        __asm__ __volatile__(                   \
+        asm volatile(
-                "mfcr\tr8,cr0;"                 \
+                "       mfcr    r8, cr0         \n"
-                "nop;"                          \
+                "       ldi     r9, 0x1         \n"
-                "nop;"                          \
+                "       and     %0, %0, r9      \n"
-                "ori\tr8,0x1;"                  \
+                "       or      r8, r8, %0      \n"
-                "mtcr\tr8,cr0;"                 \
+                "       mtcr    r8, cr0         \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                :                               \
+                :
-                :                               \
+                : "r"(flags)
-                : "r8");                        \
+                : "r8", "r9", "memory");
 }
-#define raw_local_irq_disable(void)             \
+static inline void arch_local_irq_enable(void)
-{                                               \
+{
-        __asm__ __volatile__(                   \
+        asm volatile(
-                "mfcr\tr8,cr0;"                 \
+                "       mfcr    r8,cr0          \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "srli\tr8,r8,1;"                \
+                "       ori     r8,0x1          \n"
-                "slli\tr8,r8,1;"                \
+                "       mtcr    r8,cr0          \n"
-                "mtcr\tr8,cr0;"                 \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                :
-                :                               \
+                :
-                :                               \
+                : "r8", "memory");
-                : "r8");                        \
 }
-#define raw_local_save_flags(x)                 \
+static inline void arch_local_irq_disable(void)
-{                                               \
+{
-        __asm__ __volatile__(                   \
+        asm volatile(
-                "mfcr   r8, cr0;"               \
+                "       mfcr    r8,cr0          \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "mv     %0, r8;"                \
+                "       srli    r8,r8,1         \n"
-                "nop;"                          \
+                "       slli    r8,r8,1         \n"
-                "nop;"                          \
+                "       mtcr    r8,cr0          \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "nop;"                          \
+                "       nop                     \n"
-                "ldi    r9, 0x1;"               \
+                "       nop                     \n"
-                "and    %0, %0, r9;"            \
+                "       nop                     \n"
-                : "=r" (x)                      \
+                :
-                :                               \
+                :
-                : "r8", "r9"                    \
+                : "r8", "memory");
-                );                              \
 }
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
 {
        return !(flags & 1);
 }
-#endif
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* __ASSEMBLY__ */
 #endif /* _ASM_SCORE_IRQFLAGS_H */
diff --git a/arch/sh/include/asm/irqflags.h b/arch/sh/include/asm/irqflags.h
index a741153b41c..43b7608606c 100644
--- a/arch/sh/include/asm/irqflags.h
+++ b/arch/sh/include/asm/irqflags.h
@@ -1,8 +1,8 @@
 #ifndef __ASM_SH_IRQFLAGS_H
 #define __ASM_SH_IRQFLAGS_H
-#define RAW_IRQ_DISABLED        0xf0
+#define ARCH_IRQ_DISABLED       0xf0
-#define RAW_IRQ_ENABLED         0x00
+#define ARCH_IRQ_ENABLED        0x00
 #include <asm-generic/irqflags.h>
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index be201fdc97a..ae717e3c26d 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
 asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
                         unsigned long r6, unsigned long r7,
                         struct pt_regs __regs);
-asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv,
+asmlinkage int sys_execve(const char __user *ufilename,
-                          char __user * __user *uenvp, unsigned long r7,
+                          const char __user *const __user *uargv,
-                          struct pt_regs __regs);
+                          const char __user *const __user *uenvp,
+                          unsigned long r7, struct pt_regs __regs);
 asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
                              unsigned long r6, unsigned long r7,
                              struct pt_regs __regs);
diff --git a/arch/sh/kernel/irq_32.c b/arch/sh/kernel/irq_32.c
index e33ab15831f..e5a755be912 100644
--- a/arch/sh/kernel/irq_32.c
+++ b/arch/sh/kernel/irq_32.c
@@ -10,11 +10,11 @@
 #include <linux/irqflags.h>
 #include <linux/module.h>
-void notrace raw_local_irq_restore(unsigned long flags)
+void notrace arch_local_irq_restore(unsigned long flags)
 {
        unsigned long __dummy0, __dummy1;
-        if (flags == RAW_IRQ_DISABLED) {
+        if (flags == ARCH_IRQ_DISABLED) {
                __asm__ __volatile__ (
                        "stc    sr, %0\n\t"
                        "or     #0xf0, %0\n\t"
@@ -33,14 +33,14 @@ void notrace raw_local_irq_restore(unsigned long flags)
 #endif
                        "ldc    %0, sr\n\t"
                        : "=&r" (__dummy0), "=r" (__dummy1)
-                        : "1" (~RAW_IRQ_DISABLED)
+                        : "1" (~ARCH_IRQ_DISABLED)
                        : "memory"
                );
        }
 }
-EXPORT_SYMBOL(raw_local_irq_restore);
+EXPORT_SYMBOL(arch_local_irq_restore);
-unsigned long notrace __raw_local_save_flags(void)
+unsigned long notrace arch_local_save_flags(void)
 {
        unsigned long flags;
@@ -54,4 +54,4 @@ unsigned long notrace __raw_local_save_flags(void)
        return flags;
 }
-EXPORT_SYMBOL(__raw_local_save_flags);
+EXPORT_SYMBOL(arch_local_save_flags);
diff --git a/arch/sparc/include/asm/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
index 0fca9d97d44..d4d0711de0f 100644
--- a/arch/sparc/include/asm/irqflags_32.h
+++ b/arch/sparc/include/asm/irqflags_32.h
@@ -5,33 +5,40 @@
 *
 * This file gets included from lowlevel asm headers too, to provide
 * wrapped versions of the local_irq_*() APIs, based on the
- * raw_local_irq_*() functions from the lowlevel headers.
+ * arch_local_irq_*() functions from the lowlevel headers.
 */
 #ifndef _ASM_IRQFLAGS_H
 #define _ASM_IRQFLAGS_H
 #ifndef __ASSEMBLY__
-extern void raw_local_irq_restore(unsigned long);
+#include <linux/types.h>
-extern unsigned long __raw_local_irq_save(void);
-extern void raw_local_irq_enable(void);
-static inline unsigned long getipl(void)
+extern void arch_local_irq_restore(unsigned long);
+extern unsigned long arch_local_irq_save(void);
+extern void arch_local_irq_enable(void);
+static inline unsigned long arch_local_save_flags(void)
 {
-        unsigned long retval;
+        unsigned long flags;
+        asm volatile("rd        %%psr, %0" : "=r" (flags));
+        return flags;
+}
-        __asm__ __volatile__("rd        %%psr, %0" : "=r" (retval));
+static inline void arch_local_irq_disable(void)
-        return retval;
+{
+        arch_local_irq_save();
 }
-#define raw_local_save_flags(flags) ((flags) = getipl())
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
-#define raw_local_irq_save(flags)   ((flags) = __raw_local_irq_save())
+{
-#define raw_local_irq_disable()     ((void) __raw_local_irq_save())
+        return (flags & PSR_PIL) != 0;
-#define raw_irqs_disabled()         ((getipl() & PSR_PIL) != 0)
+}
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline bool arch_irqs_disabled(void)
 {
-        return ((flags & PSR_PIL) != 0);
+        return arch_irqs_disabled_flags(arch_local_save_flags());
 }
 #endif /* (__ASSEMBLY__) */
diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h
index bfa1ea45b4c..aab969c82c2 100644
--- a/arch/sparc/include/asm/irqflags_64.h
+++ b/arch/sparc/include/asm/irqflags_64.h
@@ -5,7 +5,7 @@
 *
 * This file gets included from lowlevel asm headers too, to provide
 * wrapped versions of the local_irq_*() APIs, based on the
- * raw_local_irq_*() functions from the lowlevel headers.
+ * arch_local_irq_*() functions from the lowlevel headers.
 */
 #ifndef _ASM_IRQFLAGS_H
 #define _ASM_IRQFLAGS_H
@@ -14,7 +14,7 @@
 #ifndef __ASSEMBLY__
-static inline unsigned long __raw_local_save_flags(void)
+static inline unsigned long arch_local_save_flags(void)
 {
        unsigned long flags;
@@ -26,10 +26,7 @@ static inline unsigned long __raw_local_save_flags(void)
        return flags;
 }
-#define raw_local_save_flags(flags) \
+static inline void arch_local_irq_restore(unsigned long flags)
-                do { (flags) = __raw_local_save_flags(); } while (0)
-static inline void raw_local_irq_restore(unsigned long flags)
 {
        __asm__ __volatile__(
                "wrpr   %0, %%pil"
@@ -39,7 +36,7 @@ static inline void raw_local_irq_restore(unsigned long flags)
        );
 }
-static inline void raw_local_irq_disable(void)
+static inline void arch_local_irq_disable(void)
 {
        __asm__ __volatile__(
                "wrpr   %0, %%pil"
@@ -49,7 +46,7 @@ static inline void raw_local_irq_disable(void)
        );
 }
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_enable(void)
 {
        __asm__ __volatile__(
                "wrpr   0, %%pil"
@@ -59,22 +56,17 @@ static inline void raw_local_irq_enable(void)
        );
 }
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline int arch_irqs_disabled_flags(unsigned long flags)
 {
        return (flags > 0);
 }
-static inline int raw_irqs_disabled(void)
+static inline int arch_irqs_disabled(void)
 {
-        unsigned long flags = __raw_local_save_flags();
+        return arch_irqs_disabled_flags(arch_local_save_flags());
-        return raw_irqs_disabled_flags(flags);
 }
-/*
+static inline unsigned long arch_local_irq_save(void)
- * For spinlocks, etc:
- */
-static inline unsigned long __raw_local_irq_save(void)
 {
        unsigned long flags, tmp;
@@ -100,9 +92,6 @@ static inline unsigned long __raw_local_irq_save(void)
        return flags;
 }
-#define raw_local_irq_save(flags) \
-                do { (flags) = __raw_local_irq_save(); } while (0)
 #endif /* (__ASSEMBLY__) */
 #endif /* !(_ASM_IRQFLAGS_H) */
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index e1af4372832..0116d8d10de 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -57,7 +57,7 @@
 #define SMP_NOP2
 #define SMP_NOP3
 #endif /* SMP */
-unsigned long __raw_local_irq_save(void)
+unsigned long arch_local_irq_save(void)
 {
        unsigned long retval;
        unsigned long tmp;
@@ -74,8 +74,9 @@ unsigned long __raw_local_irq_save(void)
        return retval;
 }
+EXPORT_SYMBOL(arch_local_irq_save);
-void raw_local_irq_enable(void)
+void arch_local_irq_enable(void)
 {
        unsigned long tmp;
@@ -89,8 +90,9 @@ void raw_local_irq_enable(void)
                : "i" (PSR_PIL)
                : "memory");
 }
+EXPORT_SYMBOL(arch_local_irq_enable);
-void raw_local_irq_restore(unsigned long old_psr)
+void arch_local_irq_restore(unsigned long old_psr)
 {
        unsigned long tmp;
@@ -105,10 +107,7 @@ void raw_local_irq_restore(unsigned long old_psr)
                : "i" (PSR_PIL), "r" (old_psr)
                : "memory");
 }
+EXPORT_SYMBOL(arch_local_irq_restore);
-EXPORT_SYMBOL(__raw_local_irq_save);
-EXPORT_SYMBOL(raw_local_irq_enable);
-EXPORT_SYMBOL(raw_local_irq_restore);
 /*
 * Dave Redman (djhr@tadpole.co.uk)
diff --git a/arch/sparc/prom/p1275.c b/arch/sparc/prom/p1275.c
index fa6e4e219b9..d9850c2b9bf 100644
--- a/arch/sparc/prom/p1275.c
+++ b/arch/sparc/prom/p1275.c
@@ -39,7 +39,7 @@ void p1275_cmd_direct(unsigned long *args)
        unsigned long flags;
        raw_local_save_flags(flags);
-        raw_local_irq_restore(PIL_NMI);
+        raw_local_irq_restore((unsigned long)PIL_NMI);
        raw_spin_lock(&prom_entry_lock);
        prom_world(1);
diff --git a/arch/tile/include/asm/irqflags.h b/arch/tile/include/asm/irqflags.h
index 45cf67c2f28..a11d4837ee4 100644
--- a/arch/tile/include/asm/irqflags.h
+++ b/arch/tile/include/asm/irqflags.h
@@ -103,55 +103,57 @@ DECLARE_PER_CPU(unsigned long long, interrupts_enabled_mask);
 #define INITIAL_INTERRUPTS_ENABLED INT_MASK(INT_MEM_ERROR)
 /* Disable interrupts. */
-#define raw_local_irq_disable() \
+#define arch_local_irq_disable() \
        interrupt_mask_set_mask(LINUX_MASKABLE_INTERRUPTS)
 /* Disable all interrupts, including NMIs. */
-#define raw_local_irq_disable_all() \
+#define arch_local_irq_disable_all() \
        interrupt_mask_set_mask(-1UL)
 /* Re-enable all maskable interrupts. */
-#define raw_local_irq_enable() \
+#define arch_local_irq_enable() \
        interrupt_mask_reset_mask(__get_cpu_var(interrupts_enabled_mask))
 /* Disable or enable interrupts based on flag argument. */
-#define raw_local_irq_restore(disabled) do { \
+#define arch_local_irq_restore(disabled) do { \
        if (disabled) \
-                raw_local_irq_disable(); \
+                arch_local_irq_disable(); \
        else \
-                raw_local_irq_enable(); \
+                arch_local_irq_enable(); \
 } while (0)
 /* Return true if "flags" argument means interrupts are disabled. */
-#define raw_irqs_disabled_flags(flags) ((flags) != 0)
+#define arch_irqs_disabled_flags(flags) ((flags) != 0)
 /* Return true if interrupts are currently disabled. */
-#define raw_irqs_disabled() interrupt_mask_check(INT_MEM_ERROR)
+#define arch_irqs_disabled() interrupt_mask_check(INT_MEM_ERROR)
 /* Save whether interrupts are currently disabled. */
-#define raw_local_save_flags(flags) ((flags) = raw_irqs_disabled())
+#define arch_local_save_flags() arch_irqs_disabled()
 /* Save whether interrupts are currently disabled, then disable them. */
-#define raw_local_irq_save(flags) \
+#define arch_local_irq_save() ({ \
-        do { raw_local_save_flags(flags); raw_local_irq_disable(); } while (0)
+        unsigned long __flags = arch_local_save_flags(); \
+        arch_local_irq_disable(); \
+        __flags; })
 /* Prevent the given interrupt from being enabled next time we enable irqs. */
-#define raw_local_irq_mask(interrupt) \
+#define arch_local_irq_mask(interrupt) \
        (__get_cpu_var(interrupts_enabled_mask) &= ~INT_MASK(interrupt))
 /* Prevent the given interrupt from being enabled immediately. */
-#define raw_local_irq_mask_now(interrupt) do { \
+#define arch_local_irq_mask_now(interrupt) do { \
-        raw_local_irq_mask(interrupt); \
+        arch_local_irq_mask(interrupt); \
        interrupt_mask_set(interrupt); \
 } while (0)
 /* Allow the given interrupt to be enabled next time we enable irqs. */
-#define raw_local_irq_unmask(interrupt) \
+#define arch_local_irq_unmask(interrupt) \
        (__get_cpu_var(interrupts_enabled_mask) |= INT_MASK(interrupt))
 /* Allow the given interrupt to be enabled immediately, if !irqs_disabled. */
-#define raw_local_irq_unmask_now(interrupt) do { \
+#define arch_local_irq_unmask_now(interrupt) do { \
-        raw_local_irq_unmask(interrupt); \
+        arch_local_irq_unmask(interrupt); \
        if (!irqs_disabled()) \
                interrupt_mask_reset(interrupt); \
 } while (0)
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 9e2b952f810..5745ce8bf10 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -61,22 +61,22 @@ static inline void native_halt(void)
 #else
 #ifndef __ASSEMBLY__
-static inline unsigned long __raw_local_save_flags(void)
+static inline unsigned long arch_local_save_flags(void)
 {
        return native_save_fl();
 }
-static inline void raw_local_irq_restore(unsigned long flags)
+static inline void arch_local_irq_restore(unsigned long flags)
 {
        native_restore_fl(flags);
 }
-static inline void raw_local_irq_disable(void)
+static inline void arch_local_irq_disable(void)
 {
        native_irq_disable();
 }
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_enable(void)
 {
        native_irq_enable();
 }
@@ -85,7 +85,7 @@ static inline void raw_local_irq_enable(void)
 * Used in the idle loop; sti takes one instruction cycle
 * to complete:
 */
-static inline void raw_safe_halt(void)
+static inline void arch_safe_halt(void)
 {
        native_safe_halt();
 }
@@ -102,12 +102,10 @@ static inline void halt(void)
 /*
 * For spinlocks, etc:
 */
-static inline unsigned long __raw_local_irq_save(void)
+static inline unsigned long arch_local_irq_save(void)
 {
-        unsigned long flags = __raw_local_save_flags();
+        unsigned long flags = arch_local_save_flags();
+        arch_local_irq_disable();
-        raw_local_irq_disable();
        return flags;
 }
 #else
@@ -153,22 +151,16 @@ static inline unsigned long __raw_local_irq_save(void)
 #endif /* CONFIG_PARAVIRT */
 #ifndef __ASSEMBLY__
-#define raw_local_save_flags(flags)                             \
+static inline int arch_irqs_disabled_flags(unsigned long flags)
-        do { (flags) = __raw_local_save_flags(); } while (0)
-#define raw_local_irq_save(flags)                               \
-        do { (flags) = __raw_local_irq_save(); } while (0)
-static inline int raw_irqs_disabled_flags(unsigned long flags)
 {
        return !(flags & X86_EFLAGS_IF);
 }
-static inline int raw_irqs_disabled(void)
+static inline int arch_irqs_disabled(void)
 {
-        unsigned long flags = __raw_local_save_flags();
+        unsigned long flags = arch_local_save_flags();
-        return raw_irqs_disabled_flags(flags);
+        return arch_irqs_disabled_flags(flags);
 }
 #else
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index edecb4ed221..18e3b8a8709 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -105,7 +105,7 @@ static inline void write_cr8(unsigned long x)
 }
 #endif
-static inline void raw_safe_halt(void)
+static inline void arch_safe_halt(void)
 {
        PVOP_VCALL0(pv_irq_ops.safe_halt);
 }
@@ -824,32 +824,32 @@ static __always_inline void arch_spin_unlock(struct arch_spinlock *lock)
 #define __PV_IS_CALLEE_SAVE(func)                       \
        ((struct paravirt_callee_save) { func })
-static inline unsigned long __raw_local_save_flags(void)
+static inline unsigned long arch_local_save_flags(void)
 {
        return PVOP_CALLEE0(unsigned long, pv_irq_ops.save_fl);
 }
-static inline void raw_local_irq_restore(unsigned long f)
+static inline void arch_local_irq_restore(unsigned long f)
 {
        PVOP_VCALLEE1(pv_irq_ops.restore_fl, f);
 }
-static inline void raw_local_irq_disable(void)
+static inline void arch_local_irq_disable(void)
 {
        PVOP_VCALLEE0(pv_irq_ops.irq_disable);
 }
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_enable(void)
 {
        PVOP_VCALLEE0(pv_irq_ops.irq_enable);
 }
-static inline unsigned long __raw_local_irq_save(void)
+static inline unsigned long arch_local_irq_save(void)
 {
        unsigned long f;
-        f = __raw_local_save_flags();
+        f = arch_local_save_flags();
-        raw_local_irq_disable();
+        arch_local_irq_disable();
        return f;
 }
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index e0500646585..23e061b9327 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -224,7 +224,7 @@ static noinline int xen_spin_lock_slow(struct arch_spinlock *lock, bool irq_enab
                        goto out;
                }
-                flags = __raw_local_save_flags();
+                flags = arch_local_save_flags();
                if (irq_enable) {
                        ADD_STATS(taken_slow_irqenable, 1);
                        raw_local_irq_enable();
diff --git a/arch/xtensa/include/asm/irqflags.h b/arch/xtensa/include/asm/irqflags.h
new file mode 100644
index 00000000000..dae9a8bdcb1
--- /dev/null
+++ b/arch/xtensa/include/asm/irqflags.h
@@ -0,0 +1,58 @@
+/*
+ * Xtensa IRQ flags handling functions
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2001 - 2005 Tensilica Inc.
+ */
+#ifndef _XTENSA_IRQFLAGS_H
+#define _XTENSA_IRQFLAGS_H
+#include <linux/types.h>
+static inline unsigned long arch_local_save_flags(void)
+{
+        unsigned long flags;
+        asm volatile("rsr %0,"__stringify(PS) : "=a" (flags));
+        return flags;
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags;
+        asm volatile("rsil %0, "__stringify(LOCKLEVEL)
+                     : "=a" (flags) :: "memory");
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+        arch_local_irq_save();
+}
+static inline void arch_local_irq_enable(void)
+{
+        unsigned long flags;
+        asm volatile("rsil %0, 0" : "=a" (flags) :: "memory");
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+        asm volatile("wsr %0, "__stringify(PS)" ; rsync"
+                     :: "a" (flags) : "memory");
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & 0xf) != 0;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+#endif /* _XTENSA_IRQFLAGS_H */
diff --git a/arch/xtensa/include/asm/system.h b/arch/xtensa/include/asm/system.h
index 62b1e8f3c13..1e7e09ab6cd 100644
--- a/arch/xtensa/include/asm/system.h
+++ b/arch/xtensa/include/asm/system.h
@@ -12,41 +12,10 @@
 #define _XTENSA_SYSTEM_H
 #include <linux/stringify.h>
+#include <linux/irqflags.h>
 #include <asm/processor.h>
-/* interrupt control */
-#define local_save_flags(x)                                             \
-        __asm__ __volatile__ ("rsr %0,"__stringify(PS) : "=a" (x));
-#define local_irq_restore(x)    do {                                    \
-        __asm__ __volatile__ ("wsr %0, "__stringify(PS)" ; rsync"       \
-                              :: "a" (x) : "memory"); } while(0);
-#define local_irq_save(x)       do {                                    \
-        __asm__ __volatile__ ("rsil %0, "__stringify(LOCKLEVEL)         \
-                              : "=a" (x) :: "memory");} while(0);
-static inline void local_irq_disable(void)
-{
-        unsigned long flags;
-        __asm__ __volatile__ ("rsil %0, "__stringify(LOCKLEVEL)
-                              : "=a" (flags) :: "memory");
-}
-static inline void local_irq_enable(void)
-{
-        unsigned long flags;
-        __asm__ __volatile__ ("rsil %0, 0" : "=a" (flags) :: "memory");
-}
-static inline int irqs_disabled(void)
-{
-        unsigned long flags;
-        local_save_flags(flags);
-        return flags & 0xf;
-}
 #define smp_read_barrier_depends() do { } while(0)
 #define read_barrier_depends() do { } while(0)
diff --git a/crypto/des_generic.c b/crypto/des_generic.c
index 249f903cc45..873818d48e8 100644
--- a/crypto/des_generic.c
+++ b/crypto/des_generic.c
@@ -614,7 +614,7 @@ static const u32 S8[64] = {
 #define T3(x) pt[2 * (x) + 2]
 #define T4(x) pt[2 * (x) + 3]
-#define PC2(a, b, c, d) (T4(d) | T3(c) | T2(b) | T1(a))
+#define DES_PC2(a, b, c, d) (T4(d) | T3(c) | T2(b) | T1(a))
 /*
 * Encryption key expansion
@@ -639,22 +639,22 @@ unsigned long des_ekey(u32 *pe, const u8 *k)
        b = k[6]; b &= 0x0e; b <<= 4; b |= k[2] & 0x1e; b = pc1[b];
        a = k[7]; a &= 0x0e; a <<= 4; a |= k[3] & 0x1e; a = pc1[a];
-        pe[15 * 2 + 0] = PC2(a, b, c, d); d = rs[d];
+        pe[15 * 2 + 0] = DES_PC2(a, b, c, d); d = rs[d];
-        pe[14 * 2 + 0] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[14 * 2 + 0] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[13 * 2 + 0] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[13 * 2 + 0] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[12 * 2 + 0] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[12 * 2 + 0] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[11 * 2 + 0] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[11 * 2 + 0] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[10 * 2 + 0] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[10 * 2 + 0] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 9 * 2 + 0] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 9 * 2 + 0] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 8 * 2 + 0] = PC2(d, a, b, c); c = rs[c];
+        pe[ 8 * 2 + 0] = DES_PC2(d, a, b, c); c = rs[c];
-        pe[ 7 * 2 + 0] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 7 * 2 + 0] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 6 * 2 + 0] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 6 * 2 + 0] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[ 5 * 2 + 0] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 5 * 2 + 0] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 4 * 2 + 0] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 4 * 2 + 0] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[ 3 * 2 + 0] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 3 * 2 + 0] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 2 * 2 + 0] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 2 * 2 + 0] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[ 1 * 2 + 0] = PC2(c, d, a, b); b = rs[b];
+        pe[ 1 * 2 + 0] = DES_PC2(c, d, a, b); b = rs[b];
-        pe[ 0 * 2 + 0] = PC2(b, c, d, a);
+        pe[ 0 * 2 + 0] = DES_PC2(b, c, d, a);
        /* Check if first half is weak */
        w  = (a ^ c) | (b ^ d) | (rs[a] ^ c) | (b ^ rs[d]);
@@ -670,22 +670,22 @@ unsigned long des_ekey(u32 *pe, const u8 *k)
        /* Check if second half is weak */
        w |= (a ^ c) | (b ^ d) | (rs[a] ^ c) | (b ^ rs[d]);
-        pe[15 * 2 + 1] = PC2(a, b, c, d); d = rs[d];
+        pe[15 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d];
-        pe[14 * 2 + 1] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[14 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[13 * 2 + 1] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[13 * 2 + 1] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[12 * 2 + 1] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[12 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[11 * 2 + 1] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[11 * 2 + 1] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[10 * 2 + 1] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[10 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 9 * 2 + 1] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 9 * 2 + 1] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 8 * 2 + 1] = PC2(d, a, b, c); c = rs[c];
+        pe[ 8 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c];
-        pe[ 7 * 2 + 1] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 7 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 6 * 2 + 1] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 6 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[ 5 * 2 + 1] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 5 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 4 * 2 + 1] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 4 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[ 3 * 2 + 1] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 3 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 2 * 2 + 1] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 2 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[ 1 * 2 + 1] = PC2(c, d, a, b); b = rs[b];
+        pe[ 1 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b];
-        pe[ 0 * 2 + 1] = PC2(b, c, d, a);
+        pe[ 0 * 2 + 1] = DES_PC2(b, c, d, a);
        /* Fixup: 2413 5768 -> 1357 2468 */
        for (d = 0; d < 16; ++d) {
@@ -722,22 +722,22 @@ static void dkey(u32 *pe, const u8 *k)
        b = k[6]; b &= 0x0e; b <<= 4; b |= k[2] & 0x1e; b = pc1[b];
        a = k[7]; a &= 0x0e; a <<= 4; a |= k[3] & 0x1e; a = pc1[a];
-        pe[ 0 * 2] = PC2(a, b, c, d); d = rs[d];
+        pe[ 0 * 2] = DES_PC2(a, b, c, d); d = rs[d];
-        pe[ 1 * 2] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[ 1 * 2] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 2 * 2] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 2 * 2] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 3 * 2] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[ 3 * 2] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 4 * 2] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 4 * 2] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 5 * 2] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[ 5 * 2] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 6 * 2] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 6 * 2] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 7 * 2] = PC2(d, a, b, c); c = rs[c];
+        pe[ 7 * 2] = DES_PC2(d, a, b, c); c = rs[c];
-        pe[ 8 * 2] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 8 * 2] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 9 * 2] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 9 * 2] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[10 * 2] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[10 * 2] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[11 * 2] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[11 * 2] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[12 * 2] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[12 * 2] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[13 * 2] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[13 * 2] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[14 * 2] = PC2(c, d, a, b); b = rs[b];
+        pe[14 * 2] = DES_PC2(c, d, a, b); b = rs[b];
-        pe[15 * 2] = PC2(b, c, d, a);
+        pe[15 * 2] = DES_PC2(b, c, d, a);
        /* Skip to next table set */
        pt += 512;
@@ -747,22 +747,22 @@ static void dkey(u32 *pe, const u8 *k)
        b = k[2]; b &= 0xe0; b >>= 4; b |= k[6] & 0xf0; b = pc1[b + 1];
        a = k[3]; a &= 0xe0; a >>= 4; a |= k[7] & 0xf0; a = pc1[a + 1];
-        pe[ 0 * 2 + 1] = PC2(a, b, c, d); d = rs[d];
+        pe[ 0 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d];
-        pe[ 1 * 2 + 1] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[ 1 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 2 * 2 + 1] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 2 * 2 + 1] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 3 * 2 + 1] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[ 3 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 4 * 2 + 1] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 4 * 2 + 1] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 5 * 2 + 1] = PC2(d, a, b, c); c = rs[c]; b = rs[b];
+        pe[ 5 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c]; b = rs[b];
-        pe[ 6 * 2 + 1] = PC2(b, c, d, a); a = rs[a]; d = rs[d];
+        pe[ 6 * 2 + 1] = DES_PC2(b, c, d, a); a = rs[a]; d = rs[d];
-        pe[ 7 * 2 + 1] = PC2(d, a, b, c); c = rs[c];
+        pe[ 7 * 2 + 1] = DES_PC2(d, a, b, c); c = rs[c];
-        pe[ 8 * 2 + 1] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[ 8 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[ 9 * 2 + 1] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[ 9 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[10 * 2 + 1] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[10 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[11 * 2 + 1] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[11 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[12 * 2 + 1] = PC2(c, d, a, b); b = rs[b]; a = rs[a];
+        pe[12 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b]; a = rs[a];
-        pe[13 * 2 + 1] = PC2(a, b, c, d); d = rs[d]; c = rs[c];
+        pe[13 * 2 + 1] = DES_PC2(a, b, c, d); d = rs[d]; c = rs[c];
-        pe[14 * 2 + 1] = PC2(c, d, a, b); b = rs[b];
+        pe[14 * 2 + 1] = DES_PC2(c, d, a, b); b = rs[b];
-        pe[15 * 2 + 1] = PC2(b, c, d, a);
+        pe[15 * 2 + 1] = DES_PC2(b, c, d, a);
        /* Fixup: 2413 5768 -> 1357 2468 */
        for (d = 0; d < 16; ++d) {
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 012613fde3f..03d063554b7 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -38,6 +38,7 @@
 #include <asm/blackfin.h>
 #include <asm/cacheflush.h>
 #include <asm/portmux.h>
+#include <mach/pll.h>
 #include "bfin_mac.h"
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 10cf0cbc218..726df611ee1 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -72,6 +72,7 @@ static const char version[] =
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/crc32.h>
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index f6d72e1f2a3..5707a80b96b 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -468,7 +468,7 @@ sclp_sync_wait(void)
        cr0_sync &= 0xffff00a0;
        cr0_sync |= 0x00000200;
        __ctl_load(cr0_sync, 0, 0);
-        __raw_local_irq_stosm(0x01);
+        __arch_local_irq_stosm(0x01);
        /* Loop until driver state indicates finished request */
        while (sclp_running_state != sclp_running_state_idle) {
                /* Check for expired request timer */
diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c
index f2d9e667972..f885c868a04 100644
--- a/drivers/vlynq/vlynq.c
+++ b/drivers/vlynq/vlynq.c
@@ -31,6 +31,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/irq.h>
 #include <linux/vlynq.h>
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index 2a410170eca..909923800a0 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -64,6 +64,7 @@
 #include <linux/cpu.h>
 #include <linux/smp.h>
 #include <linux/fs.h>
+#include <linux/irq.h>
 #include <asm/mipsregs.h>
 #include <asm/uasm.h>
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index e53347fbf1d..fd57b8477fa 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -43,6 +43,7 @@
 */
 #define atomic_set(v, i) (((v)->counter) = (i))
+#include <linux/irqflags.h>
 #include <asm/system.h>
 /**
@@ -57,7 +58,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
        unsigned long flags;
        int temp;
-        raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
+        raw_local_irq_save(flags); /* Don't trace it in an irqsoff handler */
        temp = v->counter;
        temp += i;
        v->counter = temp;
@@ -78,7 +79,7 @@ static inline int atomic_sub_return(int i, atomic_t *v)
        unsigned long flags;
        int temp;
-        raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
+        raw_local_irq_save(flags); /* Don't trace it in an irqsoff handler */
        temp = v->counter;
        temp -= i;
        v->counter = temp;
diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h
index b2ba2fc8829..2533fddd34a 100644
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
@@ -2,6 +2,7 @@
 #define __ASM_GENERIC_CMPXCHG_LOCAL_H
 #include <linux/types.h>
+#include <linux/irqflags.h>
 extern unsigned long wrong_size_cmpxchg(volatile void *ptr);
diff --git a/include/asm-generic/irqflags.h b/include/asm-generic/irqflags.h
index 9aebf618275..1f40d0024cf 100644
--- a/include/asm-generic/irqflags.h
+++ b/include/asm-generic/irqflags.h
@@ -5,68 +5,62 @@
 * All architectures should implement at least the first two functions,
 * usually inline assembly will be the best way.
 */
-#ifndef RAW_IRQ_DISABLED
+#ifndef ARCH_IRQ_DISABLED
-#define RAW_IRQ_DISABLED 0
+#define ARCH_IRQ_DISABLED 0
-#define RAW_IRQ_ENABLED 1
+#define ARCH_IRQ_ENABLED 1
 #endif
 /* read interrupt enabled status */
-#ifndef __raw_local_save_flags
+#ifndef arch_local_save_flags
-unsigned long __raw_local_save_flags(void);
+unsigned long arch_local_save_flags(void);
 #endif
 /* set interrupt enabled status */
-#ifndef raw_local_irq_restore
+#ifndef arch_local_irq_restore
-void raw_local_irq_restore(unsigned long flags);
+void arch_local_irq_restore(unsigned long flags);
 #endif
 /* get status and disable interrupts */
-#ifndef __raw_local_irq_save
+#ifndef arch_local_irq_save
-static inline unsigned long __raw_local_irq_save(void)
+static inline unsigned long arch_local_irq_save(void)
 {
        unsigned long flags;
-        flags = __raw_local_save_flags();
+        flags = arch_local_save_flags();
-        raw_local_irq_restore(RAW_IRQ_DISABLED);
+        arch_local_irq_restore(ARCH_IRQ_DISABLED);
        return flags;
 }
 #endif
 /* test flags */
-#ifndef raw_irqs_disabled_flags
+#ifndef arch_irqs_disabled_flags
-static inline int raw_irqs_disabled_flags(unsigned long flags)
+static inline int arch_irqs_disabled_flags(unsigned long flags)
 {
-        return flags == RAW_IRQ_DISABLED;
+        return flags == ARCH_IRQ_DISABLED;
 }
 #endif
 /* unconditionally enable interrupts */
-#ifndef raw_local_irq_enable
+#ifndef arch_local_irq_enable
-static inline void raw_local_irq_enable(void)
+static inline void arch_local_irq_enable(void)
 {
-        raw_local_irq_restore(RAW_IRQ_ENABLED);
+        arch_local_irq_restore(ARCH_IRQ_ENABLED);
 }
 #endif
 /* unconditionally disable interrupts */
-#ifndef raw_local_irq_disable
+#ifndef arch_local_irq_disable
-static inline void raw_local_irq_disable(void)
+static inline void arch_local_irq_disable(void)
 {
-        raw_local_irq_restore(RAW_IRQ_DISABLED);
+        arch_local_irq_restore(ARCH_IRQ_DISABLED);
 }
 #endif
 /* test hardware interrupt enable bit */
-#ifndef raw_irqs_disabled
+#ifndef arch_irqs_disabled
-static inline int raw_irqs_disabled(void)
+static inline int arch_irqs_disabled(void)
 {
-        return raw_irqs_disabled_flags(__raw_local_save_flags());
+        return arch_irqs_disabled_flags(arch_local_save_flags());
 }
 #endif
-#define raw_local_save_flags(flags) \
-        do { (flags) = __raw_local_save_flags(); } while (0)
-#define raw_local_irq_save(flags) \
-        do { (flags) = __raw_local_irq_save(); } while (0)
 #endif /* __ASM_GENERIC_IRQFLAGS_H */
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 96c323ac44d..8a389b608ce 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -8,7 +8,6 @@
 #include <linux/lockdep.h>
 #include <linux/ftrace_irq.h>
 #include <asm/hardirq.h>
-#include <asm/system.h>
 /*
 * We put the hardirq and softirq counter into the preemption
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 006bf45eae3..d176d658fe2 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -12,6 +12,7 @@
 #define _LINUX_TRACE_IRQFLAGS_H
 #include <linux/typecheck.h>
+#include <asm/irqflags.h>
 #ifdef CONFIG_TRACE_IRQFLAGS
  extern void trace_softirqs_on(unsigned long ip);
@@ -52,17 +53,45 @@
 # define start_critical_timings() do { } while (0)
 #endif
-#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+/*
+ * Wrap the arch provided IRQ routines to provide appropriate checks.
-#include <asm/irqflags.h>
+ */
+#define raw_local_irq_disable()         arch_local_irq_disable()
+#define raw_local_irq_enable()          arch_local_irq_enable()
+#define raw_local_irq_save(flags)                       \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                flags = arch_local_irq_save();          \
+        } while (0)
+#define raw_local_irq_restore(flags)                    \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                arch_local_irq_restore(flags);          \
+        } while (0)
+#define raw_local_save_flags(flags)                     \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                flags = arch_local_save_flags();        \
+        } while (0)
+#define raw_irqs_disabled_flags(flags)                  \
+        ({                                              \
+                typecheck(unsigned long, flags);        \
+                arch_irqs_disabled_flags(flags);        \
+        })
+#define raw_irqs_disabled()             (arch_irqs_disabled())
+#define raw_safe_halt()                 arch_safe_halt()
+/*
+ * The local_irq_*() APIs are equal to the raw_local_irq*()
+ * if !TRACE_IRQFLAGS.
+ */
+#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
 #define local_irq_enable() \
        do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)
 #define local_irq_disable() \
        do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
 #define local_irq_save(flags)                           \
        do {                                            \
-                typecheck(unsigned long, flags);        \
                raw_local_irq_save(flags);              \
                trace_hardirqs_off();                   \
        } while (0)
@@ -70,7 +99,6 @@
 #define local_irq_restore(flags)                        \
        do {                                            \
-                typecheck(unsigned long, flags);        \
                if (raw_irqs_disabled_flags(flags)) {   \
                        raw_local_irq_restore(flags);   \
                        trace_hardirqs_off();           \
@@ -79,51 +107,44 @@
                        raw_local_irq_restore(flags);   \
                }                                       \
        } while (0)
-#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
+#define local_save_flags(flags)                         \
-/*
- * The local_irq_*() APIs are equal to the raw_local_irq*()
- * if !TRACE_IRQFLAGS.
- */
-# define raw_local_irq_disable()        local_irq_disable()
-# define raw_local_irq_enable()         local_irq_enable()
-# define raw_local_irq_save(flags)                      \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                local_irq_save(flags);                  \
-        } while (0)
-# define raw_local_irq_restore(flags)                   \
        do {                                            \
-                typecheck(unsigned long, flags);        \
+                raw_local_save_flags(flags);            \
-                local_irq_restore(flags);               \
        } while (0)
-#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
-#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+#define irqs_disabled_flags(flags)                      \
-#define safe_halt()                                             \
+        ({                                              \
-        do {                                                    \
+                raw_irqs_disabled_flags(flags);         \
-                trace_hardirqs_on();                            \
+        })
-                raw_safe_halt();                                \
-        } while (0)
-#define local_save_flags(flags)                         \
+#define irqs_disabled()                                 \
-        do {                                            \
+        ({                                              \
-                typecheck(unsigned long, flags);        \
+                unsigned long _flags;                   \
-                raw_local_save_flags(flags);            \
+                raw_local_save_flags(_flags);           \
+                raw_irqs_disabled_flags(_flags);        \
+        })
+#define safe_halt()                             \
+        do {                                    \
+                trace_hardirqs_on();            \
+                raw_safe_halt();                \
        } while (0)
-#define irqs_disabled()                                         \
-({                                                              \
-        unsigned long _flags;                                   \
-                                                                \
-        raw_local_save_flags(_flags);                           \
-        raw_irqs_disabled_flags(_flags);                        \
-})
-#define irqs_disabled_flags(flags)              \
+#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
-({                                              \
-        typecheck(unsigned long, flags);        \
+#define local_irq_enable()      do { raw_local_irq_enable(); } while (0)
-        raw_irqs_disabled_flags(flags);         \
+#define local_irq_disable()     do { raw_local_irq_disable(); } while (0)
-})
+#define local_irq_save(flags)                                   \
+        do {                                                    \
+                raw_local_irq_save(flags);                      \
+        } while (0)
+#define local_irq_restore(flags) do { raw_local_irq_restore(flags); } while (0)
+#define local_save_flags(flags) do { raw_local_save_flags(flags); } while (0)
+#define irqs_disabled()         (raw_irqs_disabled())
+#define irqs_disabled_flags(flags) (raw_irqs_disabled_flags(flags))
+#define safe_halt()             do { raw_safe_halt(); } while (0)
 #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
 #endif
diff --git a/include/linux/list.h b/include/linux/list.h
index d167b5d7c0a..88a000617d7 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -5,7 +5,6 @@
 #include <linux/stddef.h>
 #include <linux/poison.h>
 #include <linux/prefetch.h>
-#include <asm/system.h>
 /*
 * Simple doubly linked list implementation.
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index f8854655860..80e535897de 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -50,6 +50,7 @@
 #include <linux/preempt.h>
 #include <linux/linkage.h>
 #include <linux/compiler.h>
+#include <linux/irqflags.h>
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>