]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: Do not allow the probing of the local timer
authorVarun Swara <Varun.Swara@arm.com>
Wed, 9 Dec 2009 10:02:19 +0000 (10:02 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 9 Dec 2009 13:19:31 +0000 (13:19 +0000)
Since this IRQ descriptor doesn't have an action registered, it is
allowed for probing via probe_irq_on/off() and it will be disabled by
the latter function. This patch sets the IRQ_NOPROBE status bit for the
local timer descriptor.

Signed-off-by: Varun Swara <Varun.Swara@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm/kernel/smp_twd.c

index a73a34dccf2a6de247f20bb5fc4e9622b03561a1..ea02a7b1c244af0afd610f6fc00c7f836f72ae4d 100644 (file)
@@ -160,6 +160,7 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)
 
        /* Make sure our local interrupt controller has this enabled */
        local_irq_save(flags);
+       irq_to_desc(clk->irq)->status |= IRQ_NOPROBE;
        get_irq_chip(clk->irq)->unmask(clk->irq);
        local_irq_restore(flags);