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

Commit 7c45ad16 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: fix some double export warnings 



Some functions are exported twice in current code - remove the excess export.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 802e3077

arch/um/kernel/ksyms.c

+1 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(um_virt_to_phys); 
EXPORT_SYMBOL(mode_tt);

EXPORT_SYMBOL(handle_page_fault);

EXPORT_SYMBOL(find_iomem);

EXPORT_SYMBOL(end_iomem);



#ifdef CONFIG_MODE_TT

EXPORT_SYMBOL(strncpy_from_user_tt);
@@ -89,12 +88,10 @@ EXPORT_SYMBOL(dump_thread); 
EXPORT_SYMBOL(do_gettimeofday);

EXPORT_SYMBOL(do_settimeofday);



/* This is here because UML expands open to sys_open, not to a system

/* This is here because UML expands lseek to sys_lseek, not to a system

 * call instruction.

 */

EXPORT_SYMBOL(sys_open);

EXPORT_SYMBOL(sys_lseek);

EXPORT_SYMBOL(sys_read);

EXPORT_SYMBOL(sys_wait4);



#ifdef CONFIG_SMP

arch/um/os-Linux/user_syms.c

+7 −2
Original line number Diff line number Diff line
@@ -18,14 +18,19 @@ extern void *memmove(void *, const void *, size_t); 
extern void *memset(void *, int, size_t);

extern int printf(const char *, ...);



/* If they're not defined, the export is included in lib/string.c.*/

#ifdef __HAVE_ARCH_STRLEN

EXPORT_SYMBOL(strlen);

#endif

#ifdef __HAVE_ARCH_STRSTR

EXPORT_SYMBOL(strstr);

#endif



EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(printf);



EXPORT_SYMBOL(strstr);



/* Here, instead, I can provide a fake prototype. Yes, someone cares: genksyms.

 * However, the modules will use the CRC defined *here*, no matter if it is

 * good; so the versions of these symbols will always match

arch/um/sys-i386/ksyms.c

+0 −4
Original line number Diff line number Diff line
@@ -15,7 +15,3 @@ EXPORT_SYMBOL(__up_wakeup); 


/* Networking helper routines. */

EXPORT_SYMBOL(csum_partial);
 


/* delay core functions */

EXPORT_SYMBOL(__const_udelay);

EXPORT_SYMBOL(__udelay);