diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2014-04-21 15:39:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-29 01:12:25 -0400 |
commit | 2b399177dc58b28efa5937613760bdabfd5638f0 (patch) | |
tree | d9167eb5bc90034e23aa539249cbd9624e3b754a /arch/sparc/kernel/leon_kernel.c | |
parent | fcd0196b7eb17a8b696a1263281bcdb9eedcfbc0 (diff) |
sparc32: fix sparse warnings in sun4m_irq.c and sun4d_irq.c
Fix following warnings:
sun4m_irq.c:308:6: warning: symbol 'sun4m_nmi' was not declared. Should it be static?
sun4m_irq.c:396:28: warning: incorrect type in assignment (different address spaces)
sun4m_irq.c:396:28: expected unsigned int volatile *extern [addressable] [toplevel] master_l10_counter
sun4d_irq.c:469:28: warning: incorrect type in assignment (different address spaces)
sun4d_irq.c:469:28: expected unsigned int volatile *extern [addressable] [toplevel] master_l10_counter
master_l10_counter is a pointer to __iomem - add annotations.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/leon_kernel.c')
-rw-r--r-- | arch/sparc/kernel/leon_kernel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c index b7c68976cbc7..b9a2599e3a3a 100644 --- a/arch/sparc/kernel/leon_kernel.c +++ b/arch/sparc/kernel/leon_kernel.c | |||
@@ -32,7 +32,7 @@ struct leon3_gptimer_regs_map *leon3_gptimer_regs; /* timer controller base addr | |||
32 | 32 | ||
33 | int leondebug_irq_disable; | 33 | int leondebug_irq_disable; |
34 | int leon_debug_irqout; | 34 | int leon_debug_irqout; |
35 | static int dummy_master_l10_counter; | 35 | static volatile unsigned int dummy_master_l10_counter; |
36 | unsigned long amba_system_id; | 36 | unsigned long amba_system_id; |
37 | static DEFINE_SPINLOCK(leon_irq_lock); | 37 | static DEFINE_SPINLOCK(leon_irq_lock); |
38 | 38 | ||
@@ -313,7 +313,8 @@ void __init leon_init_timers(void) | |||
313 | 313 | ||
314 | leondebug_irq_disable = 0; | 314 | leondebug_irq_disable = 0; |
315 | leon_debug_irqout = 0; | 315 | leon_debug_irqout = 0; |
316 | master_l10_counter = (unsigned int *)&dummy_master_l10_counter; | 316 | master_l10_counter = |
317 | (unsigned int __iomem *)&dummy_master_l10_counter; | ||
317 | dummy_master_l10_counter = 0; | 318 | dummy_master_l10_counter = 0; |
318 | 319 | ||
319 | rootnp = of_find_node_by_path("/ambapp0"); | 320 | rootnp = of_find_node_by_path("/ambapp0"); |