[PATCH] H8/300 some error/warning fix

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c
index f1189ccd9344f11d2b7c4d4616b7c5a4d082077d..b60d234d1d2761b7ce4eca0a1f7ee69cce04b6f3 100644 (file)
--- a/arch/h8300/kernel/ptrace.c
+++ b/arch/h8300/kernel/ptrace.c
@@ -107,7 +107,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
 
        /* read the word at location addr in the USER area. */
                case PTRACE_PEEKUSR: {
-                       unsigned long tmp;
+                       unsigned long tmp = 0;
                        
                        if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) {
                                ret = -EIO;

diff --git a/arch/h8300/lib/checksum.c b/arch/h8300/lib/checksum.c
index 6691d0b935b739ac6cd9ff8b392a8359a5e3e38f..5aa688d9242de97378f25fb77334cfc7883c7c89 100644 (file)
--- a/arch/h8300/lib/checksum.c
+++ b/arch/h8300/lib/checksum.c
@@ -32,6 +32,7 @@
    of the assembly has to go. */
 
 #include <net/checksum.h>
+#include <linux/module.h>
 
 static inline unsigned short from32to16(unsigned long x)
 {

diff --git a/arch/h8300/platform/h8300h/generic/timer.c b/arch/h8300/platform/h8300h/generic/timer.c
index ffc0349b74f9db0f16e1f523d598522e34c3a986..6590f89e521a8239be3e6b6665b0bbf46f1d32de 100644 (file)
--- a/arch/h8300/platform/h8300h/generic/timer.c
+++ b/arch/h8300/platform/h8300h/generic/timer.c
@@ -32,7 +32,7 @@
 
 #define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */
 
-int platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
+void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
 {
        /* setup 8bit timer ch2 */
        ctrl_outb(H8300_TIMER_FREQ / HZ, TCORA2);      /* set interval */
@@ -69,7 +69,7 @@ void platform_timer_eoi(void)
 
 #define H8300_TIMER_FREQ CONFIG_CPU_CLOCK*1000/8 /* Timer input freq. */
 
-int platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
+void __init platform_timer_setup(irqreturn_t (*timer_int)(int, void *, struct pt_regs *))
 {
        *(unsigned short *)GRA= H8300_TIMER_FREQ / HZ;  /* set interval */
        *(unsigned short *)TCNT=0;                      /* clear counter */

diff --git a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h
index 893e6f1c7efd5498132db2b4076af73484a2a3ce..94b7a46a6043eb86d1169e394cc6c1c094201e2d 100644 (file)
--- a/include/asm-h8300/bitops.h
+++ b/include/asm-h8300/bitops.h
@@ -273,6 +273,8 @@ found_middle:
        return result + __ffs(tmp);
 }
 
+#define find_first_bit(addr, size) find_next_bit(addr, size, 0)
+
 /*
  * Every architecture must define this function. It's the fastest
  * way of searching a 140-bit bitmap where the first 100 bits are