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

Commit e007c533 authored by Al Viro's avatar Al Viro
Browse files

ia64: move exports to definitions 



Here we have another kind of deviation from the default case -
a difference between exporting functions and non-functions.
EXPORT_DATA_SYMBOL... is really different from EXPORT_SYMBOL...
on ia64, and we need to use the right one when moving exports
from *.c where C compiler has the required information to
*.S, where we need to supply it manually.

parisc64 will be another one like that.

Tested-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent fb2e6fdb

arch/ia64/include/asm/export.h

0 → 100644
+3 −0
Original line number Diff line number Diff line 
/* EXPORT_DATA_SYMBOL != EXPORT_SYMBOL here */

#define KSYM_FUNC(name) @fptr(name)

#include <asm-generic/export.h>

arch/ia64/kernel/entry.S

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <asm/thread_info.h>

#include <asm/unistd.h>

#include <asm/ftrace.h>

#include <asm/export.h>



#include "minstate.h"
@@ -1345,12 +1346,14 @@ GLOBAL_ENTRY(unw_init_running) 
	mov rp=loc0

	br.ret.sptk.many rp

END(unw_init_running)

EXPORT_SYMBOL(unw_init_running)



#ifdef CONFIG_FUNCTION_TRACER

#ifdef CONFIG_DYNAMIC_FTRACE

GLOBAL_ENTRY(_mcount)

	br ftrace_stub

END(_mcount)

EXPORT_SYMBOL(_mcount)



.here:

	br.ret.sptk.many b0

arch/ia64/kernel/esi_stub.S

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <asm/processor.h>

#include <asm/asmmacro.h>

#include <asm/export.h>



/*

 * Inputs:
@@ -94,3 +95,4 @@ GLOBAL_ENTRY(esi_call_phys) 
	mov gp=loc2

	br.ret.sptk.many rp

END(esi_call_phys)

EXPORT_SYMBOL_GPL(esi_call_phys)

arch/ia64/kernel/head.S

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm/mca_asm.h>

#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/export.h>



#ifdef CONFIG_HOTPLUG_CPU

#define SAL_PSR_BITS_TO_SET				\
@@ -168,6 +169,7 @@ RestRR: \ 
	__PAGE_ALIGNED_DATA



	.global empty_zero_page

EXPORT_DATA_SYMBOL_GPL(empty_zero_page)

empty_zero_page:

	.skip PAGE_SIZE

arch/ia64/kernel/ia64_ksyms.c

+2 −92
Original line number Diff line number Diff line 
/*

 * Architecture-specific kernel symbols

 *

 * Don't put any exports here unless it's defined in an assembler file.

 * All other exports should be put directly after the definition.

 */



#include <linux/module.h>



#include <linux/string.h>

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(strlen);



#include <asm/pgtable.h>

EXPORT_SYMBOL_GPL(empty_zero_page);



#include <asm/checksum.h>

EXPORT_SYMBOL(ip_fast_csum);		/* hand-coded assembly */

EXPORT_SYMBOL(csum_ipv6_magic);



#include <asm/page.h>

EXPORT_SYMBOL(clear_page);

EXPORT_SYMBOL(copy_page);



#ifdef CONFIG_VIRTUAL_MEM_MAP

#include <linux/compiler.h>

#include <linux/export.h>

#include <linux/bootmem.h>

EXPORT_SYMBOL(min_low_pfn);	/* defined by bootmem.c, but not exported by generic code */

EXPORT_SYMBOL(max_low_pfn);	/* defined by bootmem.c, but not exported by generic code */

#endif
 


#include <asm/processor.h>

EXPORT_SYMBOL(ia64_cpu_info);

#ifdef CONFIG_SMP

EXPORT_SYMBOL(local_per_cpu_offset);

#endif



#include <asm/uaccess.h>

EXPORT_SYMBOL(__copy_user);

EXPORT_SYMBOL(__do_clear_user);

EXPORT_SYMBOL(__strlen_user);

EXPORT_SYMBOL(__strncpy_from_user);

EXPORT_SYMBOL(__strnlen_user);



/* from arch/ia64/lib */

extern void __divsi3(void);

extern void __udivsi3(void);

extern void __modsi3(void);

extern void __umodsi3(void);

extern void __divdi3(void);

extern void __udivdi3(void);

extern void __moddi3(void);

extern void __umoddi3(void);



EXPORT_SYMBOL(__divsi3);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__modsi3);

EXPORT_SYMBOL(__umodsi3);

EXPORT_SYMBOL(__divdi3);

EXPORT_SYMBOL(__udivdi3);

EXPORT_SYMBOL(__moddi3);

EXPORT_SYMBOL(__umoddi3);



#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)

extern void xor_ia64_2(void);

extern void xor_ia64_3(void);

extern void xor_ia64_4(void);

extern void xor_ia64_5(void);



EXPORT_SYMBOL(xor_ia64_2);

EXPORT_SYMBOL(xor_ia64_3);

EXPORT_SYMBOL(xor_ia64_4);

EXPORT_SYMBOL(xor_ia64_5);

#endif



#include <asm/pal.h>

EXPORT_SYMBOL(ia64_pal_call_phys_stacked);

EXPORT_SYMBOL(ia64_pal_call_phys_static);

EXPORT_SYMBOL(ia64_pal_call_stacked);

EXPORT_SYMBOL(ia64_pal_call_static);

EXPORT_SYMBOL(ia64_load_scratch_fpregs);

EXPORT_SYMBOL(ia64_save_scratch_fpregs);



#include <asm/unwind.h>

EXPORT_SYMBOL(unw_init_running);



#if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)

extern void esi_call_phys (void);

EXPORT_SYMBOL_GPL(esi_call_phys);

#endif

extern char ia64_ivt[];

EXPORT_SYMBOL(ia64_ivt);



#include <asm/ftrace.h>

#ifdef CONFIG_FUNCTION_TRACER

/* mcount is defined in assembly */

EXPORT_SYMBOL(_mcount);

#endif



#include <asm/cacheflush.h>

EXPORT_SYMBOL_GPL(flush_icache_range);