projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...
[powerpc.git]
/
include
/
asm-parisc
/
irq.h
diff --git
a/include/asm-parisc/irq.h
b/include/asm-parisc/irq.h
index
377ba90
..
399c819
100644
(file)
--- a/
include/asm-parisc/irq.h
+++ b/
include/asm-parisc/irq.h
@@
-26,17
+26,12
@@
#define NR_IRQS (CPU_IRQ_MAX + 1)
#define NR_IRQS (CPU_IRQ_MAX + 1)
-/*
- * IRQ line status macro IRQ_PER_CPU is used
- */
-#define ARCH_HAS_IRQ_PER_CPU
-
static __inline__ int irq_canonicalize(int irq)
{
return (irq == 2) ? 9 : irq;
}
static __inline__ int irq_canonicalize(int irq)
{
return (irq == 2) ? 9 : irq;
}
-struct
hw_interrupt_type
;
+struct
irq_chip
;
/*
* Some useful "we don't have to do anything here" handlers. Should
/*
* Some useful "we don't have to do anything here" handlers. Should
@@
-44,6
+39,8
@@
struct hw_interrupt_type;
*/
void no_ack_irq(unsigned int irq);
void no_end_irq(unsigned int irq);
*/
void no_ack_irq(unsigned int irq);
void no_end_irq(unsigned int irq);
+void cpu_ack_irq(unsigned int irq);
+void cpu_end_irq(unsigned int irq);
extern int txn_alloc_irq(unsigned int nbits);
extern int txn_claim_irq(int);
extern int txn_alloc_irq(unsigned int nbits);
extern int txn_claim_irq(int);
@@
-51,7
+48,7
@@
extern unsigned int txn_alloc_data(unsigned int);
extern unsigned long txn_alloc_addr(unsigned int);
extern unsigned long txn_affinity_addr(unsigned int irq, int cpu);
extern unsigned long txn_alloc_addr(unsigned int);
extern unsigned long txn_affinity_addr(unsigned int irq, int cpu);
-extern int cpu_claim_irq(unsigned int irq, struct
hw_interrupt_type
*, void *);
+extern int cpu_claim_irq(unsigned int irq, struct
irq_chip
*, void *);
extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest);
/* soft power switch support (power.c) */
extern int cpu_check_affinity(unsigned int irq, cpumask_t *dest);
/* soft power switch support (power.c) */