4 files changed, 41 insertions, 1 deletions

diff --git a/arch/h8300/include/asm/bug.h b/arch/h8300/include/asm/bug.h
index edddf5b086e5..887c19773185 100644
--- a/arch/h8300/include/asm/bug.h
+++ b/arch/h8300/include/asm/bug.h
@@ -1,4 +1,8 @@
 #ifndef _H8300_BUG_H
 #define _H8300_BUG_H
+
+/* always true */
+#define is_valid_bugaddr(addr) (1)
+
 #include <asm-generic/bug.h>
 #endif
diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h
index 26dc6ccd9441..33e842f3284b 100644
--- a/arch/h8300/include/asm/io.h
+++ b/arch/h8300/include/asm/io.h
@@ -295,6 +295,40 @@ static __inline__ void ctrl_outl(unsigned long b, unsigned long addr)
         *(volatile unsigned long*)addr = b;
 }
 
+static __inline__ void ctrl_bclr(int b, unsigned long addr)
+{
+        if (__builtin_constant_p(b))
+                switch (b) {
+                case 0: __asm__("bclr #0,@%0"::"r"(addr)); break;
+                case 1: __asm__("bclr #1,@%0"::"r"(addr)); break;
+                case 2: __asm__("bclr #2,@%0"::"r"(addr)); break;
+                case 3: __asm__("bclr #3,@%0"::"r"(addr)); break;
+                case 4: __asm__("bclr #4,@%0"::"r"(addr)); break;
+                case 5: __asm__("bclr #5,@%0"::"r"(addr)); break;
+                case 6: __asm__("bclr #6,@%0"::"r"(addr)); break;
+                case 7: __asm__("bclr #7,@%0"::"r"(addr)); break;
+                }
+        else
+                __asm__("bclr %w0,@%1"::"r"(b), "r"(addr));
+}
+
+static __inline__ void ctrl_bset(int b, unsigned long addr)
+{
+        if (__builtin_constant_p(b))
+                switch (b) {
+                case 0: __asm__("bset #0,@%0"::"r"(addr)); break;
+                case 1: __asm__("bset #1,@%0"::"r"(addr)); break;
+                case 2: __asm__("bset #2,@%0"::"r"(addr)); break;
+                case 3: __asm__("bset #3,@%0"::"r"(addr)); break;
+                case 4: __asm__("bset #4,@%0"::"r"(addr)); break;
+                case 5: __asm__("bset #5,@%0"::"r"(addr)); break;
+                case 6: __asm__("bset #6,@%0"::"r"(addr)); break;
+                case 7: __asm__("bset #7,@%0"::"r"(addr)); break;
+                }
+        else
+                __asm__("bset %w0,@%1"::"r"(b), "r"(addr));
+}
+
 /* Pages to physical address... */
 #define page_to_phys(page)      ((page - mem_map) << PAGE_SHIFT)
 #define page_to_bus(page)       ((page - mem_map) << PAGE_SHIFT)
diff --git a/arch/h8300/include/asm/md.h b/arch/h8300/include/asm/md.h
index 1a47dc6691fb..1b7300e0a175 100644
--- a/arch/h8300/include/asm/md.h
+++ b/arch/h8300/include/asm/md.h
@@ -1,4 +1,4 @@
-/* $Id: md.h,v 1.1 2002/11/19 02:09:26 gerg Exp $
+/*
  * md.h: High speed xor_block operation for RAID4/5 
  *
  */
diff --git a/arch/h8300/include/asm/system.h b/arch/h8300/include/asm/system.h
index 4b8e475908ae..d98d97685f06 100644
--- a/arch/h8300/include/asm/system.h
+++ b/arch/h8300/include/asm/system.h
@@ -155,4 +155,6 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 
 #define arch_align_stack(x) (x)
 
+void die(char *str, struct pt_regs *fp, unsigned long err);
+
 #endif /* _H8300_SYSTEM_H */