aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2012-05-19 16:02:48 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-20 02:27:37 -0400
commitf6678d3b4107c2ea254f4f4c78dfd4e5dfe04d6a (patch)
tree669d326ea42860f144c1c1bcf8af880ed0681fe7 /arch/sparc
parent123521e41481d5e26d61c60deb9a32ce47dc0060 (diff)
sparc32,leon: remove duplicate definitions in leon.h
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Konrad Eisele <konrad@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/include/asm/leon.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index 7a66bd9d5051..24f802beffb9 100644
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -240,18 +240,11 @@ static inline int sparc_leon3_cpuid(void)
240#define LEON2_CFG_SSIZE_MASK 0x00007000UL 240#define LEON2_CFG_SSIZE_MASK 0x00007000UL
241 241
242#ifndef __ASSEMBLY__ 242#ifndef __ASSEMBLY__
243extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr);
244extern void leon_flush_icache_all(void);
245extern void leon_flush_dcache_all(void);
246extern void leon_flush_cache_all(void);
247extern void leon_flush_tlb_all(void);
248extern int leon_flush_during_switch;
249extern int leon_flush_needed(void);
250
251struct vm_area_struct; 243struct vm_area_struct;
244
245extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr);
252extern void leon_flush_icache_all(void); 246extern void leon_flush_icache_all(void);
253extern void leon_flush_dcache_all(void); 247extern void leon_flush_dcache_all(void);
254extern void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page);
255extern void leon_flush_cache_all(void); 248extern void leon_flush_cache_all(void);
256extern void leon_flush_tlb_all(void); 249extern void leon_flush_tlb_all(void);
257extern int leon_flush_during_switch; 250extern int leon_flush_during_switch;
@@ -286,15 +279,9 @@ extern void leon_update_virq_handling(unsigned int virq,
286extern void leon_init_timers(void); 279extern void leon_init_timers(void);
287extern void leon_trans_init(struct device_node *dp); 280extern void leon_trans_init(struct device_node *dp);
288extern void leon_node_init(struct device_node *dp, struct device_node ***nextp); 281extern void leon_node_init(struct device_node *dp, struct device_node ***nextp);
289extern void leon_init_IRQ(void);
290extern void leon_init(void);
291extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr);
292extern void init_leon(void); 282extern void init_leon(void);
293extern void poke_leonsparc(void); 283extern void poke_leonsparc(void);
294extern void leon3_getCacheRegs(struct leon3_cacheregs *regs); 284extern void leon3_getCacheRegs(struct leon3_cacheregs *regs);
295extern int leon_flush_needed(void);
296extern void leon_switch_mm(void);
297extern int srmmu_swprobe_trace;
298extern int leon3_ticker_irq; 285extern int leon3_ticker_irq;
299 286
300#ifdef CONFIG_SMP 287#ifdef CONFIG_SMP