Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a697dc93 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge non-mmu and mmu versions of m68k_ksyms.c 



After cleaning up m68k_ksyms_no.c it is now strait forward to merge
the non-mmu and mmu versions of m68k_ksyms.c. The need for the extra
gcc functions is not strictly based on having an MMU or not. It is
based on the family the processor belongs too, so use an appropriate
conditional check.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 2c7f3feb

arch/m68k/kernel/m68k_ksyms.c

+32 −4
Original line number Diff line number Diff line 
#ifdef CONFIG_MMU

#include "m68k_ksyms_mm.c"

#else

#include "m68k_ksyms_no.c"

#include <linux/module.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);



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

   explicitly (the C compiler generates them).  Fortunately,

   their interface isn't gonna change any time soon now, so

   it's OK to leave it out of version control.  */

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(__muldi3);



#if !defined(__mc68020__) && !defined(__mc68030__) && \

    !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcpu32__)

/*

 * Simpler 68k and ColdFire parts also need a few other gcc functions.

 */

extern long long __divsi3(long long, long long);

extern long long __modsi3(long long, long long);

extern long long __mulsi3(long long, long long);

extern long long __udivsi3(long long, long long);

extern long long __umodsi3(long long, long long);



EXPORT_SYMBOL(__divsi3);

EXPORT_SYMBOL(__modsi3);

EXPORT_SYMBOL(__mulsi3);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__umodsi3);

#endif

arch/m68k/kernel/m68k_ksyms_mm.c

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#include <linux/module.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);



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

   explicitly (the C compiler generates them).  Fortunately,

   their interface isn't gonna change any time soon now, so

   it's OK to leave it out of version control.  */

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(__muldi3);

arch/m68k/kernel/m68k_ksyms_no.c

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

#include <linux/linkage.h>

#include <linux/sched.h>

#include <linux/string.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/checksum.h>

#include <asm/current.h>



/*

 * libgcc functions - functions that are used internally by the

 * compiler...  (prototypes are not correct though, but that

 * doesn't really matter since they're not versioned).

 */

extern void __ashldi3(void);

extern void __ashrdi3(void);

extern void __divsi3(void);

extern void __lshrdi3(void);

extern void __modsi3(void);

extern void __muldi3(void);

extern void __mulsi3(void);

extern void __udivsi3(void);

extern void __umodsi3(void);



        /* gcc lib functions */

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__divsi3);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(__modsi3);

EXPORT_SYMBOL(__muldi3);

EXPORT_SYMBOL(__mulsi3);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__umodsi3);