diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:47 -0400 |
commit | 6714465e83e784d65d0f4dbab7f2238574febfce (patch) | |
tree | 42e2f992203b84577ec5b18033ed54099f2f1bf9 /arch/powerpc/platforms/pseries/xics.c | |
parent | 733ea869e5756e0fd0333728cc1ed7c42e6ddfc0 (diff) |
[PATCH] irq-flags: POWERPC: 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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/xics.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 4d935d0817f2..2ffebe31cb2d 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -59,7 +59,7 @@ static struct radix_tree_root irq_map = RADIX_TREE_INIT(GFP_ATOMIC); | |||
59 | 59 | ||
60 | /* | 60 | /* |
61 | * Mark IPIs as higher priority so we can take them inside interrupts that | 61 | * Mark IPIs as higher priority so we can take them inside interrupts that |
62 | * arent marked SA_INTERRUPT | 62 | * arent marked IRQF_DISABLED |
63 | */ | 63 | */ |
64 | #define IPI_PRIORITY 4 | 64 | #define IPI_PRIORITY 4 |
65 | 65 | ||
@@ -586,9 +586,12 @@ void xics_request_IPIs(void) | |||
586 | { | 586 | { |
587 | virt_irq_to_real_map[XICS_IPI] = XICS_IPI; | 587 | virt_irq_to_real_map[XICS_IPI] = XICS_IPI; |
588 | 588 | ||
589 | /* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */ | 589 | /* |
590 | request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, SA_INTERRUPT, | 590 | * IPIs are marked IRQF_DISABLED as they must run with irqs |
591 | "IPI", NULL); | 591 | * disabled |
592 | */ | ||
593 | request_irq(irq_offset_up(XICS_IPI), xics_ipi_action, | ||
594 | IRQF_DISABLED, "IPI", NULL); | ||
592 | get_irq_desc(irq_offset_up(XICS_IPI))->status |= IRQ_PER_CPU; | 595 | get_irq_desc(irq_offset_up(XICS_IPI))->status |= IRQ_PER_CPU; |
593 | } | 596 | } |
594 | #endif | 597 | #endif |