diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/mips-gic-timer.c | 3 | ||||
| -rw-r--r-- | drivers/irqchip/irq-mips-gic.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index 2603f50e5706..bced17d2d2c1 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device); | 18 | static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device); |
| 19 | static int gic_timer_irq_installed; | 19 | static int gic_timer_irq_installed; |
| 20 | static unsigned int gic_frequency; | ||
| 20 | 21 | ||
| 21 | static int gic_next_event(unsigned long delta, struct clock_event_device *evt) | 22 | static int gic_next_event(unsigned long delta, struct clock_event_device *evt) |
| 22 | { | 23 | { |
| @@ -112,6 +113,8 @@ static struct clocksource gic_clocksource = { | |||
| 112 | 113 | ||
| 113 | void __init gic_clocksource_init(unsigned int frequency) | 114 | void __init gic_clocksource_init(unsigned int frequency) |
| 114 | { | 115 | { |
| 116 | gic_frequency = frequency; | ||
| 117 | |||
| 115 | /* Set clocksource mask. */ | 118 | /* Set clocksource mask. */ |
| 116 | gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width()); | 119 | gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width()); |
| 117 | 120 | ||
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index cb674696810d..7ec3c18f1330 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
| 19 | #include <asm/traps.h> | 19 | #include <asm/traps.h> |
| 20 | 20 | ||
| 21 | unsigned int gic_frequency; | ||
| 22 | unsigned int gic_present; | 21 | unsigned int gic_present; |
| 23 | 22 | ||
| 24 | struct gic_pcpu_mask { | 23 | struct gic_pcpu_mask { |
