Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2166abd authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Russell King
Browse files

[ARM] 3679/1: ARM: Make ARM dyntick implementation work with genirq 



Patch from Thomas Gleixner

From: Thomas Gleixner <tglx@linutronix.de>

Make the ARM dyntick implementation work with the generic
irq code. This hopefully goes away once we consolidated the
dyntick implementations.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9262e914

kernel/irq/handle.c

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#include <linux/interrupt.h>

#include <linux/kernel_stat.h>



#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)

#include <asm/dyntick.h>

#endif



#include "internals.h"



/**
@@ -113,6 +117,15 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, 
	irqreturn_t ret, retval = IRQ_NONE;

	unsigned int status = 0;



#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)

	if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) {

		write_seqlock(&xtime_lock);

		if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)

			system_timer->dyn_tick->handler(irq, 0, regs);

		write_sequnlock(&xtime_lock);

	}

#endif



	if (!(action->flags & SA_INTERRUPT))

		local_irq_enable();