Commit 338d9150 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: add asm-prototypes.h 



Move assembly source prototypes from xtensa_ksyms.c to
asm/asm-prototypes.h, move corresponding EXPORT_SYMBOLs to the assembly
sources and enable HAVE_ASM_MODVERSIONS for xtensa.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 74e25376

arch/xtensa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ config XTENSA 
	select HAVE_ARCH_KCSAN

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ASM_MODVERSIONS

	select HAVE_CONTEXT_TRACKING_USER

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS

arch/xtensa/include/asm/asm-prototypes.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_PROTOTYPES_H

#define __ASM_PROTOTYPES_H



#include <asm/cacheflush.h>

#include <asm/checksum.h>

#include <asm/ftrace.h>

#include <asm/page.h>

#include <asm/string.h>

#include <asm/uaccess.h>



#include <asm-generic/asm-prototypes.h>



/*

 * gcc internal math functions

 */

long long __ashrdi3(long long, int);

long long __ashldi3(long long, int);

long long __bswapdi2(long long);

int __bswapsi2(int);

long long __lshrdi3(long long, int);

int __divsi3(int, int);

int __modsi3(int, int);

int __mulsi3(int, int);

unsigned int __udivsi3(unsigned int, unsigned int);

unsigned int __umodsi3(unsigned int, unsigned int);

unsigned long long __umulsidi3(unsigned int, unsigned int);



#endif /* __ASM_PROTOTYPES_H */

arch/xtensa/include/asm/asmmacro.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef _XTENSA_ASMMACRO_H

#define _XTENSA_ASMMACRO_H



#include <asm-generic/export.h>

#include <asm/core.h>



/*

arch/xtensa/kernel/mcount.S

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ ENTRY(_mcount) 
#error Unsupported Xtensa ABI

#endif

ENDPROC(_mcount)

EXPORT_SYMBOL(_mcount)



ENTRY(ftrace_stub)

	abi_entry_default

arch/xtensa/kernel/xtensa_ksyms.c

+1 −91
Original line number Diff line number Diff line
@@ -13,71 +13,10 @@ 
 */



#include <linux/module.h>

#include <linux/string.h>

#include <linux/mm.h>

#include <linux/interrupt.h>

#include <asm/irq.h>

#include <linux/in6.h>



#include <linux/uaccess.h>

#include <asm/cacheflush.h>

#include <asm/checksum.h>

#include <asm/dma.h>

#include <asm/io.h>

#include <asm/page.h>

#include <asm/ftrace.h>

#ifdef CONFIG_BLK_DEV_FD

#include <asm/floppy.h>

#endif

#ifdef CONFIG_NET

#include <net/checksum.h>

#endif /* CONFIG_NET */





/*

 * String functions

 */

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(__memset);

EXPORT_SYMBOL(__memcpy);

EXPORT_SYMBOL(__memmove);

#ifdef CONFIG_ARCH_HAS_STRNCPY_FROM_USER

EXPORT_SYMBOL(__strncpy_user);

#endif

EXPORT_SYMBOL(clear_page);

EXPORT_SYMBOL(copy_page);

#include <asm/pgtable.h>



EXPORT_SYMBOL(empty_zero_page);



/*

 * gcc internal math functions

 */

extern long long __ashrdi3(long long, int);

extern long long __ashldi3(long long, int);

extern long long __bswapdi2(long long);

extern int __bswapsi2(int);

extern long long __lshrdi3(long long, int);

extern int __divsi3(int, int);

extern int __modsi3(int, int);

extern int __mulsi3(int, int);

extern unsigned int __udivsi3(unsigned int, unsigned int);

extern unsigned int __umodsi3(unsigned int, unsigned int);

extern unsigned long long __umulsidi3(unsigned int, unsigned int);



EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__bswapdi2);

EXPORT_SYMBOL(__bswapsi2);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(__divsi3);

EXPORT_SYMBOL(__modsi3);

EXPORT_SYMBOL(__mulsi3);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__umodsi3);

EXPORT_SYMBOL(__umulsidi3);



unsigned int __sync_fetch_and_and_4(volatile void *p, unsigned int v)

{

	BUG();
@@ -89,32 +28,3 @@ unsigned int __sync_fetch_and_or_4(volatile void *p, unsigned int v) 
	BUG();

}

EXPORT_SYMBOL(__sync_fetch_and_or_4);
 


/*

 * Networking support

 */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy_generic);



/*

 * Architecture-specific symbols

 */

EXPORT_SYMBOL(__xtensa_copy_user);

EXPORT_SYMBOL(__invalidate_icache_range);



/*

 * Kernel hacking ...

 */



#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)

// FIXME EXPORT_SYMBOL(screen_info);

#endif



#ifdef CONFIG_FUNCTION_TRACER

EXPORT_SYMBOL(_mcount);

#endif



EXPORT_SYMBOL(__invalidate_dcache_range);

#if XCHAL_DCACHE_IS_WRITEBACK

EXPORT_SYMBOL(__flush_dcache_range);

#endif