[PATCH] genirq: ARM dyntick cleanup
Linus: "The hacks in kernel/irq/handle.c are really horrid. REALLY horrid." They are indeed. Move the dyntick quirks to ARM where they belong. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f82bc1762e
commit
d061daa0e3
4 changed files with 17 additions and 12 deletions
|
@ -6,4 +6,15 @@
|
|||
|
||||
#include <asm/mach/irq.h>
|
||||
|
||||
#if defined(CONFIG_NO_IDLE_HZ)
|
||||
# include <asm/dyntick.h>
|
||||
# define handle_dynamic_tick(action) \
|
||||
if (!(action->flags & SA_TIMER) && system_timer->dyn_tick) { \
|
||||
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
|
||||
|
||||
#endif
|
||||
|
|
|
@ -69,6 +69,7 @@ extern void timer_tick(struct pt_regs *);
|
|||
/*
|
||||
* Kernel time keeping support.
|
||||
*/
|
||||
struct timespec;
|
||||
extern int (*set_rtc)(void);
|
||||
extern void save_time_delta(struct timespec *delta, struct timespec *rtc);
|
||||
extern void restore_time_delta(struct timespec *delta, struct timespec *rtc);
|
||||
|
|
|
@ -182,6 +182,10 @@ extern int setup_irq(unsigned int irq, struct irqaction *new);
|
|||
|
||||
#ifdef CONFIG_GENERIC_HARDIRQS
|
||||
|
||||
#ifndef handle_dynamic_tick
|
||||
# define handle_dynamic_tick(a) do { } while (0)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
static inline void set_native_irq_info(int irq, cpumask_t mask)
|
||||
{
|
||||
|
|
|
@ -16,10 +16,6 @@
|
|||
#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"
|
||||
|
||||
/**
|
||||
|
@ -133,14 +129,7 @@ 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
|
||||
handle_dynamic_tick(action);
|
||||
|
||||
if (!(action->flags & IRQF_DISABLED))
|
||||
local_irq_enable();
|
||||
|
|
Loading…
Reference in a new issue