2 files changed, 8 insertions, 8 deletions

diff --git a/arch/sh/include/asm/irqflags.h b/arch/sh/include/asm/irqflags.h
index a741153b41c2..43b7608606c3 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 RAW_IRQ_ENABLED         0x00
+#define ARCH_IRQ_DISABLED       0xf0
+#define ARCH_IRQ_ENABLED        0x00
 
 #include <asm-generic/irqflags.h>
 
diff --git a/arch/sh/kernel/irq_32.c b/arch/sh/kernel/irq_32.c
index e33ab15831f9..e5a755be9129 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);