On Sat, 7 Oct 2006, Jesper Juhl wrote:
>
> arch/i386/mach-voyager/voyager_basic.c:170: error: conflicting types
> for 'voyager_timer_interrupt'
Gaah. That voyager timer handling is a bit confusing.
Maybe something like this would fix it?
Untested. Need James or the other alledged voyager-owner to actually test
or do somethign better..
Linus
---
diff --git a/include/asm-i386/mach-voyager/do_timer.h b/include/asm-i386/mach-voyager/do_timer.h
index 04e69c1..ada5bb9 100644
--- a/include/asm-i386/mach-voyager/do_timer.h
+++ b/include/asm-i386/mach-voyager/do_timer.h
@@ -3,12 +3,13 @@ #include <asm/voyager.h>
static inline void do_timer_interrupt_hook(void)
{
+ struct pt_regs *regs = get_irq_regs();
do_timer(1);
#ifndef CONFIG_SMP
- update_process_times(user_mode_vm(irq_regs));
+ update_process_times(user_mode_vm(regs));
#endif
- voyager_timer_interrupt();
+ voyager_timer_interrupt(regs);
}
static inline int do_timer_overflow(int count)
diff --git a/include/asm-i386/voyager.h b/include/asm-i386/voyager.h
index e74c54a..fad31ca 100644
--- a/include/asm-i386/voyager.h
+++ b/include/asm-i386/voyager.h
@@ -505,7 +505,7 @@ extern int voyager_memory_detect(int reg
extern void voyager_smp_intr_init(void);
extern __u8 voyager_extended_cmos_read(__u16 cmos_address);
extern void voyager_smp_dump(void);
-extern void voyager_timer_interrupt(void);
+extern void voyager_timer_interrupt(struct pt_regs *);
extern void smp_local_timer_interrupt(void);
extern void voyager_power_off(void);
extern void smp_voyager_power_off(void *dummy);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
