git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-powerpc
/
hw_irq.h
diff --git
a/include/asm-powerpc/hw_irq.h
b/include/asm-powerpc/hw_irq.h
index
26b89d8
..
d403592
100644
(file)
--- a/
include/asm-powerpc/hw_irq.h
+++ b/
include/asm-powerpc/hw_irq.h
@@
-6,7
+6,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm/processor.h>
#include <linux/errno.h>
#include <asm/ptrace.h>
#include <asm/processor.h>
@@
-87,27
+86,27
@@
static inline void local_irq_save_ptr(unsigned long *flags)
#define mask_irq(irq) \
({ \
irq_desc_t *desc = get_irq_desc(irq); \
#define mask_irq(irq) \
({ \
irq_desc_t *desc = get_irq_desc(irq); \
- if (desc->
handler && desc->handler->disable)
\
- desc->
handler->disable(irq);
\
+ if (desc->
chip && desc->chip->disable)
\
+ desc->
chip->disable(irq);
\
})
#define unmask_irq(irq) \
({ \
irq_desc_t *desc = get_irq_desc(irq); \
})
#define unmask_irq(irq) \
({ \
irq_desc_t *desc = get_irq_desc(irq); \
- if (desc->
handler && desc->handler->enable)
\
- desc->
handler->enable(irq);
\
+ if (desc->
chip && desc->chip->enable)
\
+ desc->
chip->enable(irq);
\
})
#define ack_irq(irq) \
({ \
irq_desc_t *desc = get_irq_desc(irq); \
})
#define ack_irq(irq) \
({ \
irq_desc_t *desc = get_irq_desc(irq); \
- if (desc->
handler && desc->handler->ack)
\
- desc->
handler->ack(irq);
\
+ if (desc->
chip && desc->chip->ack)
\
+ desc->
chip->ack(irq);
\
})
})
-/* Should we handle this via lost interrupts and IPIs or should we don't care like
- * we do now ? --BenH.
+/*
+ * interrupt-retrigger: should we handle this via lost interrupts and IPIs
+ * or should we not care like we do now ? --BenH.
*/
struct hw_interrupt_type;
*/
struct hw_interrupt_type;
-static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_HW_IRQ_H */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_HW_IRQ_H */