Commit 2e74a74f authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: drop use of extern for prototypes in arch/sparc/* 



Drop the remaining uses of extern for prototypes in .h files
in the sparc specific part of the kernel tree.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f05a6865

arch/sparc/kernel/cpumap.h

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#define _CPUMAP_H



#ifdef CONFIG_SMP

extern void cpu_map_rebuild(void);

extern int  map_to_cpu(unsigned int index);

void cpu_map_rebuild(void);

int map_to_cpu(unsigned int index);

#define cpu_map_init() cpu_map_rebuild()

#else

#define cpu_map_init() do {} while (0)

arch/sparc/kernel/entry.h

+129 −130
Original line number Diff line number Diff line
@@ -6,40 +6,39 @@ 
#include <linux/init.h>



/* irq */

extern void handler_irq(int irq, struct pt_regs *regs);

void handler_irq(int irq, struct pt_regs *regs);



#ifdef CONFIG_SPARC32

/* traps */

extern void do_hw_interrupt(struct pt_regs *regs, unsigned long type);

extern void do_illegal_instruction(struct pt_regs *regs, unsigned long pc,

void do_hw_interrupt(struct pt_regs *regs, unsigned long type);

void do_illegal_instruction(struct pt_regs *regs, unsigned long pc,

                            unsigned long npc, unsigned long psr);



extern void do_priv_instruction(struct pt_regs *regs, unsigned long pc,

void do_priv_instruction(struct pt_regs *regs, unsigned long pc,

                         unsigned long npc, unsigned long psr);

extern void do_memaccess_unaligned(struct pt_regs *regs, unsigned long pc,

                                   unsigned long npc,

                                   unsigned long psr);

extern void do_fpd_trap(struct pt_regs *regs, unsigned long pc,

void do_memaccess_unaligned(struct pt_regs *regs, unsigned long pc,

                            unsigned long npc, unsigned long psr);

extern void do_fpe_trap(struct pt_regs *regs, unsigned long pc,

void do_fpd_trap(struct pt_regs *regs, unsigned long pc,

                 unsigned long npc, unsigned long psr);

extern void handle_tag_overflow(struct pt_regs *regs, unsigned long pc,

void do_fpe_trap(struct pt_regs *regs, unsigned long pc,

                 unsigned long npc, unsigned long psr);

extern void handle_watchpoint(struct pt_regs *regs, unsigned long pc,

void handle_tag_overflow(struct pt_regs *regs, unsigned long pc,

                         unsigned long npc, unsigned long psr);

extern void handle_reg_access(struct pt_regs *regs, unsigned long pc,

void handle_watchpoint(struct pt_regs *regs, unsigned long pc,

                       unsigned long npc, unsigned long psr);

extern void handle_cp_disabled(struct pt_regs *regs, unsigned long pc,

void handle_reg_access(struct pt_regs *regs, unsigned long pc,

                       unsigned long npc, unsigned long psr);

extern void handle_cp_exception(struct pt_regs *regs, unsigned long pc,

void handle_cp_disabled(struct pt_regs *regs, unsigned long pc,

                        unsigned long npc, unsigned long psr);

void handle_cp_exception(struct pt_regs *regs, unsigned long pc,

                         unsigned long npc, unsigned long psr);







/* entry.S */

extern void fpsave(unsigned long *fpregs, unsigned long *fsr,

void fpsave(unsigned long *fpregs, unsigned long *fsr,

            void *fpqueue, unsigned long *fpqdepth);

extern void fpload(unsigned long *fpregs, unsigned long *fsr);

void fpload(unsigned long *fpregs, unsigned long *fsr);



#else /* CONFIG_SPARC32 */
@@ -66,122 +65,122 @@ struct pause_patch_entry { 
extern struct pause_patch_entry __pause_3insn_patch,

	__pause_3insn_patch_end;



extern void __init per_cpu_patch(void);

extern void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,

void __init per_cpu_patch(void);

void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *,

			     struct sun4v_1insn_patch_entry *);

extern void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,

void sun4v_patch_2insn_range(struct sun4v_2insn_patch_entry *,

			     struct sun4v_2insn_patch_entry *);

extern void __init sun4v_patch(void);

extern void __init boot_cpu_id_too_large(int cpu);

void __init sun4v_patch(void);

void __init boot_cpu_id_too_large(int cpu);

extern unsigned int dcache_parity_tl1_occurred;

extern unsigned int icache_parity_tl1_occurred;



extern asmlinkage void sparc_breakpoint(struct pt_regs *regs);

extern void timer_interrupt(int irq, struct pt_regs *regs);

asmlinkage void sparc_breakpoint(struct pt_regs *regs);

void timer_interrupt(int irq, struct pt_regs *regs);



extern void do_notify_resume(struct pt_regs *regs,

void do_notify_resume(struct pt_regs *regs,

		      unsigned long orig_i0,

		      unsigned long thread_info_flags);



extern asmlinkage int syscall_trace_enter(struct pt_regs *regs);

extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);

asmlinkage int syscall_trace_enter(struct pt_regs *regs);

asmlinkage void syscall_trace_leave(struct pt_regs *regs);



extern void bad_trap_tl1(struct pt_regs *regs, long lvl);

void bad_trap_tl1(struct pt_regs *regs, long lvl);



extern void do_fpieee(struct pt_regs *regs);

extern void do_fpother(struct pt_regs *regs);

extern void do_tof(struct pt_regs *regs);

extern void do_div0(struct pt_regs *regs);

extern void do_illegal_instruction(struct pt_regs *regs);

extern void mem_address_unaligned(struct pt_regs *regs,

void do_fpieee(struct pt_regs *regs);

void do_fpother(struct pt_regs *regs);

void do_tof(struct pt_regs *regs);

void do_div0(struct pt_regs *regs);

void do_illegal_instruction(struct pt_regs *regs);

void mem_address_unaligned(struct pt_regs *regs,

			   unsigned long sfar,

			   unsigned long sfsr);

extern void sun4v_do_mna(struct pt_regs *regs,

void sun4v_do_mna(struct pt_regs *regs,

		  unsigned long addr,

		  unsigned long type_ctx);

extern void do_privop(struct pt_regs *regs);

extern void do_privact(struct pt_regs *regs);

extern void do_cee(struct pt_regs *regs);

extern void do_cee_tl1(struct pt_regs *regs);

extern void do_dae_tl1(struct pt_regs *regs);

extern void do_iae_tl1(struct pt_regs *regs);

extern void do_div0_tl1(struct pt_regs *regs);

extern void do_fpdis_tl1(struct pt_regs *regs);

extern void do_fpieee_tl1(struct pt_regs *regs);

extern void do_fpother_tl1(struct pt_regs *regs);

extern void do_ill_tl1(struct pt_regs *regs);

extern void do_irq_tl1(struct pt_regs *regs);

extern void do_lddfmna_tl1(struct pt_regs *regs);

extern void do_stdfmna_tl1(struct pt_regs *regs);

extern void do_paw(struct pt_regs *regs);

extern void do_paw_tl1(struct pt_regs *regs);

extern void do_vaw(struct pt_regs *regs);

extern void do_vaw_tl1(struct pt_regs *regs);

extern void do_tof_tl1(struct pt_regs *regs);

extern void do_getpsr(struct pt_regs *regs);



extern void spitfire_insn_access_exception(struct pt_regs *regs,

void do_privop(struct pt_regs *regs);

void do_privact(struct pt_regs *regs);

void do_cee(struct pt_regs *regs);

void do_cee_tl1(struct pt_regs *regs);

void do_dae_tl1(struct pt_regs *regs);

void do_iae_tl1(struct pt_regs *regs);

void do_div0_tl1(struct pt_regs *regs);

void do_fpdis_tl1(struct pt_regs *regs);

void do_fpieee_tl1(struct pt_regs *regs);

void do_fpother_tl1(struct pt_regs *regs);

void do_ill_tl1(struct pt_regs *regs);

void do_irq_tl1(struct pt_regs *regs);

void do_lddfmna_tl1(struct pt_regs *regs);

void do_stdfmna_tl1(struct pt_regs *regs);

void do_paw(struct pt_regs *regs);

void do_paw_tl1(struct pt_regs *regs);

void do_vaw(struct pt_regs *regs);

void do_vaw_tl1(struct pt_regs *regs);

void do_tof_tl1(struct pt_regs *regs);

void do_getpsr(struct pt_regs *regs);



void spitfire_insn_access_exception(struct pt_regs *regs,

				    unsigned long sfsr,

				    unsigned long sfar);

extern void spitfire_insn_access_exception_tl1(struct pt_regs *regs,

void spitfire_insn_access_exception_tl1(struct pt_regs *regs,

				        unsigned long sfsr,

				        unsigned long sfar);

extern void spitfire_data_access_exception(struct pt_regs *regs,

void spitfire_data_access_exception(struct pt_regs *regs,

				    unsigned long sfsr,

				    unsigned long sfar);

extern void spitfire_data_access_exception_tl1(struct pt_regs *regs,

void spitfire_data_access_exception_tl1(struct pt_regs *regs,

				        unsigned long sfsr,

				        unsigned long sfar);

extern void spitfire_access_error(struct pt_regs *regs,

void spitfire_access_error(struct pt_regs *regs,

			   unsigned long status_encoded,

			   unsigned long afar);



extern void cheetah_fecc_handler(struct pt_regs *regs,

void cheetah_fecc_handler(struct pt_regs *regs,

			  unsigned long afsr,

			  unsigned long afar);

extern void cheetah_cee_handler(struct pt_regs *regs,

void cheetah_cee_handler(struct pt_regs *regs,

			 unsigned long afsr,

			 unsigned long afar);

extern void cheetah_deferred_handler(struct pt_regs *regs,

void cheetah_deferred_handler(struct pt_regs *regs,

			      unsigned long afsr,

			      unsigned long afar);

extern void cheetah_plus_parity_error(int type, struct pt_regs *regs);

void cheetah_plus_parity_error(int type, struct pt_regs *regs);



extern void sun4v_insn_access_exception(struct pt_regs *regs,

void sun4v_insn_access_exception(struct pt_regs *regs,

				 unsigned long addr,

				 unsigned long type_ctx);

extern void sun4v_insn_access_exception_tl1(struct pt_regs *regs,

void sun4v_insn_access_exception_tl1(struct pt_regs *regs,

				     unsigned long addr,

				     unsigned long type_ctx);

extern void sun4v_data_access_exception(struct pt_regs *regs,

void sun4v_data_access_exception(struct pt_regs *regs,

				 unsigned long addr,

				 unsigned long type_ctx);

extern void sun4v_data_access_exception_tl1(struct pt_regs *regs,

void sun4v_data_access_exception_tl1(struct pt_regs *regs,

				     unsigned long addr,

				     unsigned long type_ctx);

extern void sun4v_resum_error(struct pt_regs *regs,

void sun4v_resum_error(struct pt_regs *regs,

		       unsigned long offset);

extern void sun4v_resum_overflow(struct pt_regs *regs);

extern void sun4v_nonresum_error(struct pt_regs *regs,

void sun4v_resum_overflow(struct pt_regs *regs);

void sun4v_nonresum_error(struct pt_regs *regs,

			  unsigned long offset);

extern void sun4v_nonresum_overflow(struct pt_regs *regs);

void sun4v_nonresum_overflow(struct pt_regs *regs);



extern unsigned long sun4v_err_itlb_vaddr;

extern unsigned long sun4v_err_itlb_ctx;

extern unsigned long sun4v_err_itlb_pte;

extern unsigned long sun4v_err_itlb_error;



extern void sun4v_itlb_error_report(struct pt_regs *regs, int tl);

void sun4v_itlb_error_report(struct pt_regs *regs, int tl);



extern unsigned long sun4v_err_dtlb_vaddr;

extern unsigned long sun4v_err_dtlb_ctx;

extern unsigned long sun4v_err_dtlb_pte;

extern unsigned long sun4v_err_dtlb_error;



extern void sun4v_dtlb_error_report(struct pt_regs *regs, int tl);

extern void hypervisor_tlbop_error(unsigned long err,

void sun4v_dtlb_error_report(struct pt_regs *regs, int tl);

void hypervisor_tlbop_error(unsigned long err,

			    unsigned long op);

extern void hypervisor_tlbop_error_xcall(unsigned long err,

void hypervisor_tlbop_error_xcall(unsigned long err,

				  unsigned long op);



/* WARNING: The error trap handlers in assembly know the precise
@@ -248,8 +247,8 @@ struct ino_bucket { 
extern struct ino_bucket *ivector_table;

extern unsigned long ivector_table_pa;



extern void init_irqwork_curcpu(void);

extern void sun4v_register_mondo_queues(int this_cpu);

void init_irqwork_curcpu(void);

void sun4v_register_mondo_queues(int this_cpu);



#endif /* CONFIG_SPARC32 */

#endif /* _ENTRY_H */

arch/sparc/kernel/iommu_common.h

+7 −7
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ static inline int is_span_boundary(unsigned long entry, 
	return iommu_is_span_boundary(entry, nr, shift, boundary_size);

}



extern unsigned long iommu_range_alloc(struct device *dev,

unsigned long iommu_range_alloc(struct device *dev,

				struct iommu *iommu,

				unsigned long npages,

				unsigned long *handle);

extern void iommu_range_free(struct iommu *iommu,

void iommu_range_free(struct iommu *iommu,

		      dma_addr_t dma_addr,

		      unsigned long npages);

arch/sparc/kernel/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -96,6 +96,6 @@ void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs); 
/* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */

#define SUN4D_IPI_IRQ 13



extern void sun4d_ipi_interrupt(void);

void sun4d_ipi_interrupt(void);



#endif

arch/sparc/kernel/kernel.h

+18 −18
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ extern int ncpus_probed; 
#ifdef CONFIG_SPARC64

/* setup_64.c */

struct seq_file;

extern void cpucap_info(struct seq_file *);

void cpucap_info(struct seq_file *);



static inline unsigned long kimage_addr_to_ra(const char *p)

{
@@ -31,23 +31,23 @@ struct linux_romvec; 
void sparc32_start_kernel(struct linux_romvec *rp);



/* cpu.c */

extern void cpu_probe(void);

void cpu_probe(void);



/* traps_32.c */

extern void handle_hw_divzero(struct pt_regs *regs, unsigned long pc,

void handle_hw_divzero(struct pt_regs *regs, unsigned long pc,

                       unsigned long npc, unsigned long psr);

/* irq_32.c */

extern struct irqaction static_irqaction[];

extern int static_irq_count;

extern spinlock_t irq_action_lock;



extern void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs);

extern void init_IRQ(void);

void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs);

void init_IRQ(void);



/* sun4m_irq.c */

extern void sun4m_init_IRQ(void);

extern void sun4m_unmask_profile_irq(void);

extern void sun4m_clear_profile_irq(int cpu);

void sun4m_init_IRQ(void);

void sun4m_unmask_profile_irq(void);

void sun4m_clear_profile_irq(int cpu);



/* sun4m_smp.c */

void sun4m_cpu_pre_starting(void *arg);
@@ -61,14 +61,14 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs); 
/* sun4d_irq.c */

extern spinlock_t sun4d_imsk_lock;



extern void sun4d_init_IRQ(void);

extern int sun4d_request_irq(unsigned int irq,

void sun4d_init_IRQ(void);

int sun4d_request_irq(unsigned int irq,

                      irq_handler_t handler,

                      unsigned long irqflags,

                      const char *devname, void *dev_id);

extern int show_sun4d_interrupts(struct seq_file *, void *);

extern void sun4d_distribute_irqs(void);

extern void sun4d_free_irq(unsigned int irq, void *dev_id);

int show_sun4d_interrupts(struct seq_file *, void *);

void sun4d_distribute_irqs(void);

void sun4d_free_irq(unsigned int irq, void *dev_id);



/* sun4d_smp.c */

void sun4d_cpu_pre_starting(void *arg);
@@ -102,7 +102,7 @@ extern unsigned int real_irq_entry[]; 
extern unsigned int smp4d_ticker[];

extern unsigned int patchme_maybe_smp_msg[];



extern void floppy_hardint(void);

void floppy_hardint(void);



/* trampoline_32.S */

extern unsigned long sun4m_cpu_startup;