diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:46 -0400 |
commit | d18ecedc021351ca432a5b7e28d8f91c00957dc7 (patch) | |
tree | 312354a1f88cab5562dc97b5b4bf15b36d754d06 /arch/alpha/kernel/sys_titan.c | |
parent | 6e21361619328751e2637b004e14cf360aafbddc (diff) |
[PATCH] irq-flags: ALPHA: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha/kernel/sys_titan.c')
-rw-r--r-- | arch/alpha/kernel/sys_titan.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index a8bfc8c16a7d..302aab38d95f 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c | |||
@@ -279,15 +279,15 @@ titan_late_init(void) | |||
279 | * all reported to the kernel as machine checks, so the handler | 279 | * all reported to the kernel as machine checks, so the handler |
280 | * is a nop so it can be called to count the individual events. | 280 | * is a nop so it can be called to count the individual events. |
281 | */ | 281 | */ |
282 | request_irq(63+16, titan_intr_nop, SA_INTERRUPT, | 282 | request_irq(63+16, titan_intr_nop, IRQF_DISABLED, |
283 | "CChip Error", NULL); | 283 | "CChip Error", NULL); |
284 | request_irq(62+16, titan_intr_nop, SA_INTERRUPT, | 284 | request_irq(62+16, titan_intr_nop, IRQF_DISABLED, |
285 | "PChip 0 H_Error", NULL); | 285 | "PChip 0 H_Error", NULL); |
286 | request_irq(61+16, titan_intr_nop, SA_INTERRUPT, | 286 | request_irq(61+16, titan_intr_nop, IRQF_DISABLED, |
287 | "PChip 1 H_Error", NULL); | 287 | "PChip 1 H_Error", NULL); |
288 | request_irq(60+16, titan_intr_nop, SA_INTERRUPT, | 288 | request_irq(60+16, titan_intr_nop, IRQF_DISABLED, |
289 | "PChip 0 C_Error", NULL); | 289 | "PChip 0 C_Error", NULL); |
290 | request_irq(59+16, titan_intr_nop, SA_INTERRUPT, | 290 | request_irq(59+16, titan_intr_nop, IRQF_DISABLED, |
291 | "PChip 1 C_Error", NULL); | 291 | "PChip 1 C_Error", NULL); |
292 | 292 | ||
293 | /* | 293 | /* |
@@ -348,9 +348,9 @@ privateer_init_pci(void) | |||
348 | * Hook a couple of extra err interrupts that the | 348 | * Hook a couple of extra err interrupts that the |
349 | * common titan code won't. | 349 | * common titan code won't. |
350 | */ | 350 | */ |
351 | request_irq(53+16, titan_intr_nop, SA_INTERRUPT, | 351 | request_irq(53+16, titan_intr_nop, IRQF_DISABLED, |
352 | "NMI", NULL); | 352 | "NMI", NULL); |
353 | request_irq(50+16, titan_intr_nop, SA_INTERRUPT, | 353 | request_irq(50+16, titan_intr_nop, IRQF_DISABLED, |
354 | "Temperature Warning", NULL); | 354 | "Temperature Warning", NULL); |
355 | 355 | ||
356 | /* | 356 | /* |