Commit c85627fb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

m68k: Kill several external declarations in source files

  - Replace external declarations by proper includes where availiable.
    The accesses to some symbols had to be modified, as before they were
    declared using e.g. "extern int _end", while asm-generic/sections.h uses
    e.g. "extern char _end[]"
  - Remove unused or superfluous external declarations
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 6d0be946
...@@ -31,10 +31,6 @@ extern unsigned long dn_gettimeoffset(void); ...@@ -31,10 +31,6 @@ extern unsigned long dn_gettimeoffset(void);
extern int dn_dummy_hwclk(int, struct rtc_time *); extern int dn_dummy_hwclk(int, struct rtc_time *);
extern int dn_dummy_set_clock_mmss(unsigned long); extern int dn_dummy_set_clock_mmss(unsigned long);
extern void dn_dummy_reset(void); extern void dn_dummy_reset(void);
extern void dn_dummy_waitbut(void);
extern struct fb_info *dn_fb_init(long *);
extern void dn_dummy_debug_init(void);
extern irqreturn_t dn_process_int(int irq, struct pt_regs *fp);
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
static void dn_heartbeat(int on); static void dn_heartbeat(int on);
#endif #endif
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <asm/atari_joystick.h> #include <asm/atari_joystick.h>
#include <asm/irq.h> #include <asm/irq.h>
extern unsigned int keymap_count;
/* Hook for MIDI serial driver */ /* Hook for MIDI serial driver */
void (*atari_MIDI_interrupt_hook) (void); void (*atari_MIDI_interrupt_hook) (void);
......
...@@ -43,7 +43,6 @@ extern unsigned long bvme6000_gettimeoffset (void); ...@@ -43,7 +43,6 @@ extern unsigned long bvme6000_gettimeoffset (void);
extern int bvme6000_hwclk (int, struct rtc_time *); extern int bvme6000_hwclk (int, struct rtc_time *);
extern int bvme6000_set_clock_mmss (unsigned long); extern int bvme6000_set_clock_mmss (unsigned long);
extern void bvme6000_reset (void); extern void bvme6000_reset (void);
extern void bvme6000_waitbut(void);
void bvme6000_set_vectors (void); void bvme6000_set_vectors (void);
/* Save tick handler routine pointer, will point to do_timer() in /* Save tick handler routine pointer, will point to do_timer() in
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/initrd.h> #include <linux/initrd.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/sections.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -62,7 +63,6 @@ EXPORT_SYMBOL(vme_brdtype); ...@@ -62,7 +63,6 @@ EXPORT_SYMBOL(vme_brdtype);
int m68k_is040or060; int m68k_is040or060;
EXPORT_SYMBOL(m68k_is040or060); EXPORT_SYMBOL(m68k_is040or060);
extern int end;
extern unsigned long availmem; extern unsigned long availmem;
int m68k_num_memory; int m68k_num_memory;
...@@ -215,11 +215,10 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) ...@@ -215,11 +215,10 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
void __init setup_arch(char **cmdline_p) void __init setup_arch(char **cmdline_p)
{ {
extern int _etext, _edata, _end;
int i; int i;
/* The bootinfo is located right after the kernel bss */ /* The bootinfo is located right after the kernel bss */
m68k_parse_bootinfo((const struct bi_record *)&_end); m68k_parse_bootinfo((const struct bi_record *)_end);
if (CPU_IS_040) if (CPU_IS_040)
m68k_is040or060 = 4; m68k_is040or060 = 4;
...@@ -252,9 +251,9 @@ void __init setup_arch(char **cmdline_p) ...@@ -252,9 +251,9 @@ void __init setup_arch(char **cmdline_p)
} }
init_mm.start_code = PAGE_OFFSET; init_mm.start_code = PAGE_OFFSET;
init_mm.end_code = (unsigned long) &_etext; init_mm.end_code = (unsigned long)_etext;
init_mm.end_data = (unsigned long) &_edata; init_mm.end_data = (unsigned long)_edata;
init_mm.brk = (unsigned long) &_end; init_mm.brk = (unsigned long)_end;
*cmdline_p = m68k_command_line; *cmdline_p = m68k_command_line;
memcpy(boot_command_line, *cmdline_p, CL_SIZE); memcpy(boot_command_line, *cmdline_p, CL_SIZE);
......
...@@ -47,13 +47,6 @@ ...@@ -47,13 +47,6 @@
struct mac_booter_data mac_bi_data; struct mac_booter_data mac_bi_data;
/* New m68k bootinfo stuff and videobase */
extern int m68k_num_memory;
extern struct mem_info m68k_memory[NUM_MEMINFO];
extern struct mem_info m68k_ramdisk;
/* The phys. video addr. - might be bogus on some machines */ /* The phys. video addr. - might be bogus on some machines */
static unsigned long mac_orig_videoaddr; static unsigned long mac_orig_videoaddr;
...@@ -61,7 +54,6 @@ static unsigned long mac_orig_videoaddr; ...@@ -61,7 +54,6 @@ static unsigned long mac_orig_videoaddr;
extern unsigned long mac_gettimeoffset(void); extern unsigned long mac_gettimeoffset(void);
extern int mac_hwclk(int, struct rtc_time *); extern int mac_hwclk(int, struct rtc_time *);
extern int mac_set_clock_mmss(unsigned long); extern int mac_set_clock_mmss(unsigned long);
extern int show_mac_interrupts(struct seq_file *, void *);
extern void iop_preinit(void); extern void iop_preinit(void);
extern void iop_init(void); extern void iop_init(void);
extern void via_init(void); extern void via_init(void);
...@@ -805,10 +797,6 @@ static void __init mac_identify(void) ...@@ -805,10 +797,6 @@ static void __init mac_identify(void)
mac_bi_data.boottime, mac_bi_data.gmtbias); mac_bi_data.boottime, mac_bi_data.gmtbias);
printk(KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx \n", printk(KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx \n",
mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize); mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);
#if 0
printk("Ramdisk: addr 0x%lx size 0x%lx\n",
m68k_ramdisk.addr, m68k_ramdisk.size);
#endif
iop_init(); iop_init();
via_init(); via_init();
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <asm/macints.h> #include <asm/macints.h>
extern unsigned long mac_videobase; extern unsigned long mac_videobase;
extern unsigned long mac_videodepth;
extern unsigned long mac_rowbytes; extern unsigned long mac_rowbytes;
extern void mac_serial_print(const char *); extern void mac_serial_print(const char *);
......
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/macints.h> #include <asm/macints.h>
#include <asm/irq_regs.h> #include <asm/irq_regs.h>
#include <asm/mac_oss.h>
#define DEBUG_SPURIOUS #define DEBUG_SPURIOUS
#define SHUTUP_SONIC #define SHUTUP_SONIC
...@@ -146,7 +147,6 @@ static int scc_mask; ...@@ -146,7 +147,6 @@ static int scc_mask;
* VIA/RBV hooks * VIA/RBV hooks
*/ */
extern void via_init(void);
extern void via_register_interrupts(void); extern void via_register_interrupts(void);
extern void via_irq_enable(int); extern void via_irq_enable(int);
extern void via_irq_disable(int); extern void via_irq_disable(int);
...@@ -157,9 +157,6 @@ extern int via_irq_pending(int); ...@@ -157,9 +157,6 @@ extern int via_irq_pending(int);
* OSS hooks * OSS hooks
*/ */
extern int oss_present;
extern void oss_init(void);
extern void oss_register_interrupts(void); extern void oss_register_interrupts(void);
extern void oss_irq_enable(int); extern void oss_irq_enable(int);
extern void oss_irq_disable(int); extern void oss_irq_disable(int);
...@@ -170,9 +167,6 @@ extern int oss_irq_pending(int); ...@@ -170,9 +167,6 @@ extern int oss_irq_pending(int);
* PSC hooks * PSC hooks
*/ */
extern int psc_present;
extern void psc_init(void);
extern void psc_register_interrupts(void); extern void psc_register_interrupts(void);
extern void psc_irq_enable(int); extern void psc_irq_enable(int);
extern void psc_irq_disable(int); extern void psc_irq_disable(int);
...@@ -191,12 +185,10 @@ extern void iop_register_interrupts(void); ...@@ -191,12 +185,10 @@ extern void iop_register_interrupts(void);
extern int baboon_present; extern int baboon_present;
extern void baboon_init(void);
extern void baboon_register_interrupts(void); extern void baboon_register_interrupts(void);
extern void baboon_irq_enable(int); extern void baboon_irq_enable(int);
extern void baboon_irq_disable(int); extern void baboon_irq_disable(int);
extern void baboon_irq_clear(int); extern void baboon_irq_clear(int);
extern int baboon_irq_pending(int);
/* /*
* SCC interrupt routines * SCC interrupt routines
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#define RTC_OFFSET 2082844800 #define RTC_OFFSET 2082844800
extern struct mac_booter_data mac_bi_data;
static void (*rom_reset)(void); static void (*rom_reset)(void);
#ifdef CONFIG_ADB_CUDA #ifdef CONFIG_ADB_CUDA
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <asm/macints.h> #include <asm/macints.h>
#include <asm/mac_via.h> #include <asm/mac_via.h>
#include <asm/mac_psc.h> #include <asm/mac_psc.h>
#include <asm/mac_oss.h>
volatile __u8 *via1, *via2; volatile __u8 *via1, *via2;
int rbv_present; int rbv_present;
...@@ -84,7 +85,6 @@ void via_irq_disable(int irq); ...@@ -84,7 +85,6 @@ void via_irq_disable(int irq);
void via_irq_clear(int irq); void via_irq_clear(int irq);
extern irqreturn_t mac_scc_dispatch(int, void *); extern irqreturn_t mac_scc_dispatch(int, void *);
extern int oss_present;
/* /*
* Initialize the VIAs * Initialize the VIAs
......
...@@ -24,7 +24,6 @@ static const struct fp_ext fp_one = ...@@ -24,7 +24,6 @@ static const struct fp_ext fp_one =
extern struct fp_ext *fp_fadd(struct fp_ext *dest, const struct fp_ext *src); extern struct fp_ext *fp_fadd(struct fp_ext *dest, const struct fp_ext *src);
extern struct fp_ext *fp_fdiv(struct fp_ext *dest, const struct fp_ext *src); extern struct fp_ext *fp_fdiv(struct fp_ext *dest, const struct fp_ext *src);
extern struct fp_ext *fp_fmul(struct fp_ext *dest, const struct fp_ext *src);
struct fp_ext * struct fp_ext *
fp_fsqrt(struct fp_ext *dest, struct fp_ext *src) fp_fsqrt(struct fp_ext *dest, struct fp_ext *src)
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
#include <asm/atari_stram.h> #include <asm/atari_stram.h>
#endif #endif
#include <asm/sections.h>
#include <asm/tlb.h> #include <asm/tlb.h>
DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
...@@ -73,9 +74,6 @@ extern void init_pointer_table(unsigned long ptable); ...@@ -73,9 +74,6 @@ extern void init_pointer_table(unsigned long ptable);
/* References to section boundaries */ /* References to section boundaries */
extern char _text[], _etext[];
extern char __init_begin[], __init_end[];
extern pmd_t *zero_pgtable; extern pmd_t *zero_pgtable;
void __init mem_init(void) void __init mem_init(void)
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#ifdef CONFIG_ATARI #ifdef CONFIG_ATARI
#include <asm/atari_stram.h> #include <asm/atari_stram.h>
#endif #endif
#include <asm/sections.h>
#undef DEBUG #undef DEBUG
...@@ -301,14 +302,12 @@ void __init paging_init(void) ...@@ -301,14 +302,12 @@ void __init paging_init(void)
} }
} }
extern char __init_begin, __init_end;
void free_initmem(void) void free_initmem(void)
{ {
unsigned long addr; unsigned long addr;
addr = (unsigned long)&__init_begin; addr = (unsigned long)__init_begin;
for (; addr < (unsigned long)&__init_end; addr += PAGE_SIZE) { for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
virt_to_page(addr)->flags &= ~(1 << PG_reserved); virt_to_page(addr)->flags &= ~(1 << PG_reserved);
init_page_count(virt_to_page(addr)); init_page_count(virt_to_page(addr));
free_page(addr); free_page(addr);
......
...@@ -42,7 +42,6 @@ extern unsigned long mvme147_gettimeoffset (void); ...@@ -42,7 +42,6 @@ extern unsigned long mvme147_gettimeoffset (void);
extern int mvme147_hwclk (int, struct rtc_time *); extern int mvme147_hwclk (int, struct rtc_time *);
extern int mvme147_set_clock_mmss (unsigned long); extern int mvme147_set_clock_mmss (unsigned long);
extern void mvme147_reset (void); extern void mvme147_reset (void);
extern void mvme147_waitbut(void);
static int bcd2int (unsigned char b); static int bcd2int (unsigned char b);
......
...@@ -48,7 +48,6 @@ extern unsigned long mvme16x_gettimeoffset (void); ...@@ -48,7 +48,6 @@ extern unsigned long mvme16x_gettimeoffset (void);
extern int mvme16x_hwclk (int, struct rtc_time *); extern int mvme16x_hwclk (int, struct rtc_time *);
extern int mvme16x_set_clock_mmss (unsigned long); extern int mvme16x_set_clock_mmss (unsigned long);
extern void mvme16x_reset (void); extern void mvme16x_reset (void);
extern void mvme16x_waitbut(void);
int bcd2int (unsigned char b); int bcd2int (unsigned char b);
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/q40_master.h> #include <asm/q40_master.h>
extern irqreturn_t q40_process_int(int level, struct pt_regs *regs);
extern void q40_init_IRQ(void); extern void q40_init_IRQ(void);
static void q40_get_model(char *model); static void q40_get_model(char *model);
extern void q40_sched_init(irq_handler_t handler); extern void q40_sched_init(irq_handler_t handler);
...@@ -47,8 +46,6 @@ static unsigned int q40_get_ss(void); ...@@ -47,8 +46,6 @@ static unsigned int q40_get_ss(void);
static int q40_set_clock_mmss(unsigned long); static int q40_set_clock_mmss(unsigned long);
static int q40_get_rtc_pll(struct rtc_pll_info *pll); static int q40_get_rtc_pll(struct rtc_pll_info *pll);
static int q40_set_rtc_pll(struct rtc_pll_info *pll); static int q40_set_rtc_pll(struct rtc_pll_info *pll);
extern void q40_waitbut(void);
void q40_set_vectors(void);
extern void q40_mksound(unsigned int /*freq*/, unsigned int /*ticks*/); extern void q40_mksound(unsigned int /*freq*/, unsigned int /*ticks*/);
......
...@@ -27,23 +27,21 @@ ...@@ -27,23 +27,21 @@
#include <asm/sun3mmu.h> #include <asm/sun3mmu.h>
#include <asm/rtc.h> #include <asm/rtc.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/idprom.h>
#include <asm/intersil.h> #include <asm/intersil.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/sections.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/sun3ints.h> #include <asm/sun3ints.h>
extern char _text, _end;
char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; char sun3_reserved_pmeg[SUN3_PMEGS_NUM];
extern unsigned long sun3_gettimeoffset(void); extern unsigned long sun3_gettimeoffset(void);
static void sun3_sched_init(irq_handler_t handler); static void sun3_sched_init(irq_handler_t handler);
extern void sun3_get_model (char* model); extern void sun3_get_model (char* model);
extern void idprom_init (void);
extern int sun3_hwclk(int set, struct rtc_time *t); extern int sun3_hwclk(int set, struct rtc_time *t);
volatile char* clock_va; volatile char* clock_va;
extern volatile unsigned char* sun3_intreg;
extern unsigned long availmem; extern unsigned long availmem;
unsigned long num_pages; unsigned long num_pages;
...@@ -149,7 +147,7 @@ void __init config_sun3(void) ...@@ -149,7 +147,7 @@ void __init config_sun3(void)
mach_halt = sun3_halt; mach_halt = sun3_halt;
mach_get_hardware_list = sun3_get_hardware_list; mach_get_hardware_list = sun3_get_hardware_list;
memory_start = ((((int)&_end) + 0x2000) & ~0x1fff); memory_start = ((((unsigned long)_end) + 0x2000) & ~0x1fff);
// PROM seems to want the last couple of physical pages. --m // PROM seems to want the last couple of physical pages. --m
memory_end = *(romvec->pv_sun3mem) + PAGE_OFFSET - 2*PAGE_SIZE; memory_end = *(romvec->pv_sun3mem) + PAGE_OFFSET - 2*PAGE_SIZE;
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/dvma.h> #include <asm/dvma.h>
extern void prom_reboot (char *) __attribute__ ((__noreturn__));
#undef DEBUG_MMU_EMU #undef DEBUG_MMU_EMU
#define DEBUG_PROM_MAPS #define DEBUG_PROM_MAPS
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "time.h" #include "time.h"
volatile char *clock_va; volatile char *clock_va;
extern volatile unsigned char *sun3_intreg;
extern void sun3_get_model(char *model); extern void sun3_get_model(char *model);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment