Commit 2e811488 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] clean m68k ksyms 



sun3_ksyms gone, m68k_ksyms trimmed down to exports of the assembler ones,
for sun3 added the missing exports of __ioremap() and iounmap().

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 437111ca

arch/m68k/kernel/m68k_ksyms.c

+0 −51
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/linkage.h>

#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/user.h>

#include <linux/elfcore.h>

#include <linux/in6.h>

#include <linux/interrupt.h>



#include <asm/setup.h>

#include <asm/machdep.h>

#include <asm/pgalloc.h>

#include <asm/irq.h>

#include <asm/io.h>

#include <asm/semaphore.h>

#include <asm/checksum.h>



asmlinkage long long __ashldi3 (long long, int);

asmlinkage long long __ashrdi3 (long long, int);

asmlinkage long long __lshrdi3 (long long, int);

asmlinkage long long __muldi3 (long long, long long);

extern char m68k_debug_device[];



/* platform dependent support */



EXPORT_SYMBOL(m68k_machtype);

EXPORT_SYMBOL(m68k_cputype);

EXPORT_SYMBOL(m68k_is040or060);

EXPORT_SYMBOL(m68k_realnum_memory);

EXPORT_SYMBOL(m68k_memory);

#ifndef CONFIG_SUN3

EXPORT_SYMBOL(cache_push);

EXPORT_SYMBOL(cache_clear);

#ifndef CONFIG_SINGLE_MEMORY_CHUNK

EXPORT_SYMBOL(mm_vtop);

EXPORT_SYMBOL(mm_ptov);

EXPORT_SYMBOL(mm_end_of_chunk);

#else

EXPORT_SYMBOL(m68k_memoffset);

#endif /* !CONFIG_SINGLE_MEMORY_CHUNK */

EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(kernel_set_cachemode);

#endif /* !CONFIG_SUN3 */

EXPORT_SYMBOL(m68k_debug_device);

EXPORT_SYMBOL(mach_hwclk);

EXPORT_SYMBOL(mach_get_ss);

EXPORT_SYMBOL(mach_get_rtc_pll);

EXPORT_SYMBOL(mach_set_rtc_pll);

#ifdef CONFIG_INPUT_M68K_BEEP_MODULE

EXPORT_SYMBOL(mach_beep);

#endif

EXPORT_SYMBOL(dump_fpu);

EXPORT_SYMBOL(dump_thread);

EXPORT_SYMBOL(kernel_thread);

#ifdef CONFIG_VME

EXPORT_SYMBOL(vme_brdtype);

#endif



/* The following are special because they're not called

   explicitly (the C compiler generates them).  Fortunately,

arch/m68k/kernel/process.c

+3 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) 
	set_fs (fs);

	return pid;

}

EXPORT_SYMBOL(kernel_thread);



void flush_thread(void)

{
@@ -311,6 +312,7 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) 
		: "memory");

	return 1;

}

EXPORT_SYMBOL(dump_fpu);



/*

 * fill in the user structure for a core dump..
@@ -357,6 +359,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump) 
	/* dump floating point stuff */

	dump->u_fpvalid = dump_fpu (regs, &dump->m68kfp);

}

EXPORT_SYMBOL(dump_thread);



/*

 * sys_execve() executes a new program.

arch/m68k/kernel/setup.c

+15 −0
Original line number Diff line number Diff line
@@ -42,27 +42,37 @@ 


unsigned long m68k_machtype;

unsigned long m68k_cputype;

EXPORT_SYMBOL(m68k_machtype);

EXPORT_SYMBOL(m68k_cputype);

unsigned long m68k_fputype;

unsigned long m68k_mmutype;

#ifdef CONFIG_VME

unsigned long vme_brdtype;

EXPORT_SYMBOL(vme_brdtype);

#endif



int m68k_is040or060;

EXPORT_SYMBOL(m68k_is040or060);



extern int end;

extern unsigned long availmem;



int m68k_num_memory;

int m68k_realnum_memory;

EXPORT_SYMBOL(m68k_realnum_memory);

#ifdef CONFIG_SINGLE_MEMORY_CHUNK

unsigned long m68k_memoffset;

EXPORT_SYMBOL(m68k_memoffset);

#endif

struct mem_info m68k_memory[NUM_MEMINFO];

EXPORT_SYMBOL(m68k_memory);



static struct mem_info m68k_ramdisk;



static char m68k_command_line[CL_SIZE];



char m68k_debug_device[6] = "";

EXPORT_SYMBOL(m68k_debug_device);



void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;

/* machine dependent irq functions */
@@ -72,10 +82,14 @@ int (*mach_get_hardware_list) (char *buffer); 
/* machine dependent timer functions */

unsigned long (*mach_gettimeoffset) (void);

int (*mach_hwclk) (int, struct rtc_time*);

EXPORT_SYMBOL(mach_hwclk);

int (*mach_set_clock_mmss) (unsigned long);

unsigned int (*mach_get_ss)(void);

int (*mach_get_rtc_pll)(struct rtc_pll_info *);

int (*mach_set_rtc_pll)(struct rtc_pll_info *);

EXPORT_SYMBOL(mach_get_ss);

EXPORT_SYMBOL(mach_get_rtc_pll);

EXPORT_SYMBOL(mach_set_rtc_pll);

void (*mach_reset)( void );

void (*mach_halt)( void );

void (*mach_power_off)( void );
@@ -89,6 +103,7 @@ void (*mach_l2_flush) (int); 
#endif

#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)

void (*mach_beep)(unsigned int, unsigned int);

EXPORT_SYMBOL(mach_beep);

#endif

#if defined(CONFIG_ISA) && defined(MULTI_ISA)

int isa_type;

arch/m68k/mm/kmap.c

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *	     used by other architectures		/Roman Zippel

 */



#include <linux/module.h>

#include <linux/mm.h>

#include <linux/kernel.h>

#include <linux/string.h>
@@ -219,6 +220,7 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla 


	return (void __iomem *)retaddr;

}

EXPORT_SYMBOL(__ioremap);



/*

 * Unmap a ioremap()ed region again
@@ -234,6 +236,7 @@ void iounmap(void __iomem *addr) 
	free_io_area((__force void *)addr);

#endif

}

EXPORT_SYMBOL(iounmap);



/*

 * __iounmap unmaps nearly everything, so be careful
@@ -360,3 +363,4 @@ void kernel_set_cachemode(void *addr, unsigned long size, int cmode) 


	flush_tlb_all();

}

EXPORT_SYMBOL(kernel_set_cachemode);

arch/m68k/mm/memory.c

+6 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *  Copyright (C) 1995  Hamish Macdonald

 */



#include <linux/module.h>

#include <linux/mm.h>

#include <linux/kernel.h>

#include <linux/string.h>
@@ -157,9 +158,8 @@ unsigned long mm_vtop(unsigned long vaddr) 


	return -1;

}

#endif

EXPORT_SYMBOL(mm_vtop);



#ifndef CONFIG_SINGLE_MEMORY_CHUNK

unsigned long mm_ptov (unsigned long paddr)

{

	int i = 0;
@@ -185,6 +185,7 @@ unsigned long mm_ptov (unsigned long paddr) 
#endif

	return -1;

}

EXPORT_SYMBOL(mm_ptov);

#endif



/* invalidate page in both caches */
@@ -298,6 +299,7 @@ void cache_clear (unsigned long paddr, int len) 
	mach_l2_flush(0);

#endif

}

EXPORT_SYMBOL(cache_clear);	/* probably can be unexported */





/*
@@ -350,6 +352,7 @@ void cache_push (unsigned long paddr, int len) 
	mach_l2_flush(1);

#endif

}

EXPORT_SYMBOL(cache_push);	/* probably can be unexported */



#ifndef CONFIG_SINGLE_MEMORY_CHUNK

int mm_end_of_chunk (unsigned long addr, int len)
@@ -361,4 +364,5 @@ int mm_end_of_chunk (unsigned long addr, int len) 
			return 1;

	return 0;

}

EXPORT_SYMBOL(mm_end_of_chunk);

#endif