There is already a definition of __ipipe_irq_handler. So, we either need to more the real ipipe_irq_handler_t into ipipe_base.h, or rename this local variant to __ipipe_irq_handler_t, or simple drop this refactoring. This patch starts with applying the latter - the easiest one :->
Jan
---
include/asm-x86/ipipe_32.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
Index: linux-2.6.24-rc6-xeno/include/asm-x86/ipipe_32.h
===================================================================
--- linux-2.6.24-rc6-xeno.orig/include/asm-x86/ipipe_32.h
+++ linux-2.6.24-rc6-xeno/include/asm-x86/ipipe_32.h
@@ -125,11 +125,8 @@ static inline unsigned long __ipipe_ffnz
DECLARE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
-typedef void (__ipipe_irq_handler)(unsigned irq,
- void *cookie);
-
static inline void __ipipe_call_root_xirq_handler(unsigned irq,
- __ipipe_irq_handler *handler)
+ void (*handler)(unsigned, void *))
{
struct pt_regs *regs = &__raw_get_cpu_var(__ipipe_tick_regs);
@@ -161,7 +158,7 @@ void irq_enter(void);
void irq_exit(void);
static inline void __ipipe_call_root_virq_handler(unsigned irq,
- __ipipe_irq_handler *handler,
+ void (*handler)(unsigned, void *),
void *cookie)
{
irq_enter();
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Adeos-main mailing list [email protected] https://mail.gna.org/listinfo/adeos-main
