diff options
| -rw-r--r-- | drivers/irqchip/irq-mips-gic.c | 2 | ||||
| -rw-r--r-- | include/linux/irqchip/mips-gic.h | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 4ef3f53225ca..b444bef6d3c2 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #define GIC_SHARED_TO_HWIRQ(x) (GIC_SHARED_HWIRQ_BASE + (x)) | 39 | #define GIC_SHARED_TO_HWIRQ(x) (GIC_SHARED_HWIRQ_BASE + (x)) |
| 40 | #define GIC_HWIRQ_TO_SHARED(x) ((x) - GIC_SHARED_HWIRQ_BASE) | 40 | #define GIC_HWIRQ_TO_SHARED(x) ((x) - GIC_SHARED_HWIRQ_BASE) |
| 41 | 41 | ||
| 42 | unsigned int gic_present; | ||
| 43 | void __iomem *mips_gic_base; | 42 | void __iomem *mips_gic_base; |
| 44 | 43 | ||
| 45 | struct gic_pcpu_mask { | 44 | struct gic_pcpu_mask { |
| @@ -781,7 +780,6 @@ static int __init gic_of_init(struct device_node *node, | |||
| 781 | /* Ensure GIC region is enabled before trying to access it */ | 780 | /* Ensure GIC region is enabled before trying to access it */ |
| 782 | __sync(); | 781 | __sync(); |
| 783 | } | 782 | } |
| 784 | gic_present = true; | ||
| 785 | 783 | ||
| 786 | __gic_init(gic_base, gic_len, cpu_vec, 0, node); | 784 | __gic_init(gic_base, gic_len, cpu_vec, 0, node); |
| 787 | 785 | ||
diff --git a/include/linux/irqchip/mips-gic.h b/include/linux/irqchip/mips-gic.h index 63c5f87034c9..113010c8dd8b 100644 --- a/include/linux/irqchip/mips-gic.h +++ b/include/linux/irqchip/mips-gic.h | |||
| @@ -17,16 +17,10 @@ | |||
| 17 | 17 | ||
| 18 | #ifdef CONFIG_MIPS_GIC | 18 | #ifdef CONFIG_MIPS_GIC |
| 19 | 19 | ||
| 20 | extern unsigned int gic_present; | ||
| 21 | |||
| 22 | extern int gic_get_c0_compare_int(void); | 20 | extern int gic_get_c0_compare_int(void); |
| 23 | extern int gic_get_c0_perfcount_int(void); | 21 | extern int gic_get_c0_perfcount_int(void); |
| 24 | extern int gic_get_c0_fdc_int(void); | 22 | extern int gic_get_c0_fdc_int(void); |
| 25 | 23 | ||
| 26 | #else /* CONFIG_MIPS_GIC */ | ||
| 27 | |||
| 28 | #define gic_present 0 | ||
| 29 | |||
| 30 | #endif /* CONFIG_MIPS_GIC */ | 24 | #endif /* CONFIG_MIPS_GIC */ |
| 31 | 25 | ||
| 32 | #endif /* __LINUX_IRQCHIP_MIPS_GIC_H */ | 26 | #endif /* __LINUX_IRQCHIP_MIPS_GIC_H */ |
