diff options
| author | Steven J. Hill <Steven.Hill@imgtec.com> | 2013-04-10 16:27:50 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:55:20 +0200 |
| commit | 28ea215186d365408756577e9e612ee334e26f8e (patch) | |
| tree | 313d4f853f118cfab861d4f872093b355676f120 | |
| parent | ff86714fda0310ad153a2ba4836067f195e1f0b9 (diff) | |
| download | linux-next-28ea215186d365408756577e9e612ee334e26f8e.tar.gz | |
MIPS: Move 'gic_frequency' to common location.
Move the global variable 'gic_frequency' to be defined in the file
'arch/mips/kernel/irq-gic.c' instead of defining it individually
for each platform making use of the GIC. Also change the type to
be an unsigned integer instead of signed.
Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
| -rw-r--r-- | arch/mips/include/asm/gic.h | 1 | ||||
| -rw-r--r-- | arch/mips/kernel/irq-gic.c | 1 | ||||
| -rw-r--r-- | arch/mips/mti-malta/malta-time.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/gic.h b/arch/mips/include/asm/gic.h index a05f97db0735..f1a1e986d86b 100644 --- a/arch/mips/include/asm/gic.h +++ b/arch/mips/include/asm/gic.h @@ -360,6 +360,7 @@ struct gic_shared_intr_map { #define GIC_PIN_TO_VEC_OFFSET (1) extern unsigned int gic_present; +extern unsigned int gic_frequency; extern unsigned long _gic_base; extern unsigned int gic_irq_base; extern unsigned int gic_irq_flags[]; diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c index 130aec6f0644..eaf7c1eb873e 100644 --- a/arch/mips/kernel/irq-gic.c +++ b/arch/mips/kernel/irq-gic.c @@ -19,6 +19,7 @@ #include <linux/hardirq.h> #include <asm-generic/bitops/find.h> +unsigned int gic_frequency; unsigned int gic_present; unsigned long _gic_base; unsigned int gic_irq_base; diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c index 4dbdb2cbdf43..381ad062f192 100644 --- a/arch/mips/mti-malta/malta-time.c +++ b/arch/mips/mti-malta/malta-time.c @@ -42,7 +42,6 @@ #include <asm/mips-boards/maltaint.h> unsigned long cpu_khz; -int gic_frequency; static int mips_cpu_timer_irq; static int mips_cpu_perf_irq; |