Commit c85627fb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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

arch/m68k/apollo/config.c

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ extern unsigned long dn_gettimeoffset(void); 
extern int dn_dummy_hwclk(int, struct rtc_time *);

extern int dn_dummy_set_clock_mmss(unsigned long);

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

static void dn_heartbeat(int on);

#endif

arch/m68k/atari/atakeyb.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <asm/atari_joystick.h>

#include <asm/irq.h>



extern unsigned int keymap_count;



/* Hook for MIDI serial driver */

void (*atari_MIDI_interrupt_hook) (void);

arch/m68k/bvme6000/config.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ extern unsigned long bvme6000_gettimeoffset (void); 
extern int bvme6000_hwclk (int, struct rtc_time *);

extern int bvme6000_set_clock_mmss (unsigned long);

extern void bvme6000_reset (void);

extern void bvme6000_waitbut(void);

void bvme6000_set_vectors (void);



/* Save tick handler routine pointer, will point to do_timer() in

arch/m68k/kernel/setup.c

+5 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/initrd.h>



#include <asm/bootinfo.h>

#include <asm/sections.h>

#include <asm/setup.h>

#include <asm/fpu.h>

#include <asm/irq.h>
@@ -62,7 +63,6 @@ EXPORT_SYMBOL(vme_brdtype); 
int m68k_is040or060;

EXPORT_SYMBOL(m68k_is040or060);



extern int end;

extern unsigned long availmem;



int m68k_num_memory;
@@ -215,11 +215,10 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) 


void __init setup_arch(char **cmdline_p)

{

	extern int _etext, _edata, _end;

	int i;



	/* 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)

		m68k_is040or060 = 4;
@@ -252,9 +251,9 @@ void __init setup_arch(char **cmdline_p) 
	}



	init_mm.start_code = PAGE_OFFSET;

	init_mm.end_code = (unsigned long) &_etext;

	init_mm.end_data = (unsigned long) &_edata;

	init_mm.brk = (unsigned long) &_end;

	init_mm.end_code = (unsigned long)_etext;

	init_mm.end_data = (unsigned long)_edata;

	init_mm.brk = (unsigned long)_end;



	*cmdline_p = m68k_command_line;

	memcpy(boot_command_line, *cmdline_p, CL_SIZE);

arch/m68k/mac/config.c

+0 −12
Original line number Diff line number Diff line
@@ -47,13 +47,6 @@ 


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 */

static unsigned long mac_orig_videoaddr;
@@ -61,7 +54,6 @@ static unsigned long mac_orig_videoaddr; 
extern unsigned long mac_gettimeoffset(void);

extern int mac_hwclk(int, struct rtc_time *);

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_init(void);

extern void via_init(void);
@@ -805,10 +797,6 @@ static void __init mac_identify(void) 
		mac_bi_data.boottime, mac_bi_data.gmtbias);

	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);

#if 0

	printk("Ramdisk: addr 0x%lx size 0x%lx\n",

		m68k_ramdisk.addr, m68k_ramdisk.size);

#endif



	iop_init();

	via_init();

CRA Git | Maintained and supported by SUSTech CRA and CCSE