git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
irq_ia64.c
diff --git
a/arch/ia64/kernel/irq_ia64.c
b/arch/ia64/kernel/irq_ia64.c
index
ef9a2b4
..
a041367
100644
(file)
--- a/
arch/ia64/kernel/irq_ia64.c
+++ b/
arch/ia64/kernel/irq_ia64.c
@@
-14,7
+14,6
@@
* Added CPU Hotplug handling for IPF.
*/
* Added CPU Hotplug handling for IPF.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/jiffies.h>
#include <linux/module.h>
#include <linux/jiffies.h>
@@
-236,7
+235,7
@@
extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs);
static struct irqaction ipi_irqaction = {
.handler = handle_IPI,
static struct irqaction ipi_irqaction = {
.handler = handle_IPI,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.name = "IPI"
};
#endif
.name = "IPI"
};
#endif
@@
-249,9
+248,9
@@
register_percpu_irq (ia64_vector vec, struct irqaction *action)
for (irq = 0; irq < NR_IRQS; ++irq)
if (irq_to_vector(irq) == vec) {
for (irq = 0; irq < NR_IRQS; ++irq)
if (irq_to_vector(irq) == vec) {
- desc = irq_desc
p(irq)
;
+ desc = irq_desc
+ irq
;
desc->status |= IRQ_PER_CPU;
desc->status |= IRQ_PER_CPU;
- desc->
handler
= &irq_type_ia64_lsapic;
+ desc->
chip
= &irq_type_ia64_lsapic;
if (action)
setup_irq(irq, action);
}
if (action)
setup_irq(irq, action);
}