--- zzzz-none-000/linux-3.10.107/arch/h8300/include/asm/irqflags.h	2017-06-27 09:49:32.000000000 +0000
+++ scorpion-7490-727/linux-3.10.107/arch/h8300/include/asm/irqflags.h	2021-02-04 17:41:59.000000000 +0000
@@ -1,41 +1,94 @@
 #ifndef _H8300_IRQFLAGS_H
 #define _H8300_IRQFLAGS_H
 
-static inline unsigned long arch_local_save_flags(void)
+#ifdef CONFIG_CPU_H8300H
+typedef unsigned char h8300flags;
+
+static inline h8300flags arch_local_save_flags(void)
+{
+	h8300flags flags;
+
+	__asm__ volatile ("stc ccr,%w0" : "=r" (flags));
+	return flags;
+}
+
+static inline void arch_local_irq_disable(void)
+{
+	__asm__ volatile ("orc  #0xc0,ccr");
+}
+
+static inline void arch_local_irq_enable(void)
+{
+	__asm__ volatile ("andc #0x3f,ccr");
+}
+
+static inline h8300flags arch_local_irq_save(void)
 {
-	unsigned long flags;
-	asm volatile ("stc ccr,%w0" : "=r" (flags));
+	h8300flags flags;
+
+	__asm__ volatile ("stc ccr,%w0\n\t"
+		      "orc  #0xc0,ccr" : "=r" (flags));
+	return flags;
+}
+
+static inline void arch_local_irq_restore(h8300flags flags)
+{
+	__asm__ volatile ("ldc %w0,ccr" : : "r" (flags) : "cc");
+}
+
+static inline int arch_irqs_disabled_flags(unsigned long flags)
+{
+	return (flags & 0xc0) == 0xc0;
+}
+#endif
+#ifdef CONFIG_CPU_H8S
+typedef unsigned short h8300flags;
+
+static inline h8300flags arch_local_save_flags(void)
+{
+	h8300flags flags;
+
+	__asm__ volatile ("stc ccr,%w0\n\tstc exr,%x0" : "=r" (flags));
 	return flags;
 }
 
 static inline void arch_local_irq_disable(void)
 {
-	asm volatile ("orc  #0x80,ccr" : : : "memory");
+	__asm__ volatile ("orc #0x80,ccr\n\t");
 }
 
 static inline void arch_local_irq_enable(void)
 {
-	asm volatile ("andc #0x7f,ccr" : : : "memory");
+	__asm__ volatile ("andc #0x7f,ccr\n\t"
+		      "andc #0xf0,exr\n\t");
 }
 
-static inline unsigned long arch_local_irq_save(void)
+static inline h8300flags arch_local_irq_save(void)
 {
-	unsigned long flags = arch_local_save_flags();
-	arch_local_irq_disable();
+	h8300flags flags;
+
+	__asm__ volatile ("stc ccr,%w0\n\t"
+		      "stc exr,%x0\n\t"
+		      "orc  #0x80,ccr\n\t"
+		      : "=r" (flags));
 	return flags;
 }
 
-static inline void arch_local_irq_restore(unsigned long flags)
+static inline void arch_local_irq_restore(h8300flags flags)
 {
-	asm volatile ("ldc %w0,ccr" : : "r" (flags) : "memory");
+	__asm__ volatile ("ldc %w0,ccr\n\t"
+		      "ldc %x0,exr"
+		      : : "r" (flags) : "cc");
 }
 
-static inline bool arch_irqs_disabled_flags(unsigned long flags)
+static inline int arch_irqs_disabled_flags(h8300flags flags)
 {
-	return (flags & 0x80) == 0x80;
+	return (flags & 0x0080) == 0x0080;
 }
 
-static inline bool arch_irqs_disabled(void)
+#endif
+
+static inline int arch_irqs_disabled(void)
 {
 	return arch_irqs_disabled_flags(arch_local_save_flags());
 }