From eef49565f0694e8e657a5c12a6d772fcf59862d4 Mon Sep 17 00:00:00 2001 From: Wu Zhangjin Date: Sat, 23 Jul 2011 12:41:24 +0000 Subject: [PATCH] --- yaml --- r: 264295 b: refs/heads/master c: 77cbece76723dc9e77497c042827155388bdae6d h: refs/heads/master i: 264293: a417600bd5998e2d5f19d192c5ca66e41fec57d0 264291: 7fe0338b630e0842eb6d9cccd7f566c975db0e83 264287: 573274c911bde7bc18db286ae76ecabbf6cf4022 v: v3 --- [refs] | 2 +- trunk/arch/mips/loongson/fuloong-2e/irq.c | 1 + trunk/arch/mips/loongson/lemote-2f/irq.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e47e21c9784c..8de2302647d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4a4ad851dd8db2d888fb86c8bd946b2ae79f60 +refs/heads/master: 77cbece76723dc9e77497c042827155388bdae6d diff --git a/trunk/arch/mips/loongson/fuloong-2e/irq.c b/trunk/arch/mips/loongson/fuloong-2e/irq.c index d61a04222b87..3cf1fef29f0e 100644 --- a/trunk/arch/mips/loongson/fuloong-2e/irq.c +++ b/trunk/arch/mips/loongson/fuloong-2e/irq.c @@ -42,6 +42,7 @@ asmlinkage void mach_irq_dispatch(unsigned int pending) static struct irqaction cascade_irqaction = { .handler = no_action, .name = "cascade", + .flags = IRQF_NO_THREAD, }; void __init mach_init_irq(void) diff --git a/trunk/arch/mips/loongson/lemote-2f/irq.c b/trunk/arch/mips/loongson/lemote-2f/irq.c index 081db102bb98..14b081841b6b 100644 --- a/trunk/arch/mips/loongson/lemote-2f/irq.c +++ b/trunk/arch/mips/loongson/lemote-2f/irq.c @@ -96,12 +96,13 @@ static irqreturn_t ip6_action(int cpl, void *dev_id) struct irqaction ip6_irqaction = { .handler = ip6_action, .name = "cascade", - .flags = IRQF_SHARED, + .flags = IRQF_SHARED | IRQF_NO_THREAD, }; struct irqaction cascade_irqaction = { .handler = no_action, .name = "cascade", + .flags = IRQF_NO_THREAD, }; void __init mach_init_irq(void)