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

Commit f44374f1 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: Export {copy, clear}_page functions alongside their definitions 



Now that EXPORT_SYMBOL can be used from assembly source, move the
EXPORT_SYMBOL invocations for the copy_page & clear_page functions to be
alongside their definitions.

With this change there are no longer any symbols exported from
mips_ksyms.c so remove the file.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14515/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 576a2f0c

arch/mips/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ obj-$(CONFIG_SYNC_R4K) += sync-r4k.o 


obj-$(CONFIG_DEBUG_FS)		+= segment.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o



obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o

arch/mips/kernel/mips_ksyms.c

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * Export MIPS-specific functions needed for loadable modules.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05, 12 by Ralf Baechle

 * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc.

 */

#include <linux/interrupt.h>

#include <linux/export.h>

#include <asm/checksum.h>

#include <linux/mm.h>

#include <linux/uaccess.h>

#include <asm/ftrace.h>

#include <asm/fpu.h>

#include <asm/msa.h>



/*

 * Functions that operate on entire pages.  Mostly used by memory management.

 */

EXPORT_SYMBOL(clear_page);

EXPORT_SYMBOL(copy_page);

arch/mips/mm/page-funcs.S

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * Copyright (C) 2012  Ralf Baechle <ralf@linux-mips.org>

 */

#include <asm/asm.h>

#include <asm/export.h>

#include <asm/regdef.h>



#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
@@ -29,6 +30,7 @@ 
 */

EXPORT(__clear_page_start)

LEAF(cpu_clear_page_function_name)

EXPORT_SYMBOL(cpu_clear_page_function_name)

1:	j	1b		/* Dummy, will be replaced. */

	.space 288

END(cpu_clear_page_function_name)
@@ -44,6 +46,7 @@ EXPORT(__clear_page_end) 
 */

EXPORT(__copy_page_start)

LEAF(cpu_copy_page_function_name)

EXPORT_SYMBOL(cpu_copy_page_function_name)

1:	j	1b		/* Dummy, will be replaced. */

	.space 1344

END(cpu_copy_page_function_name)

arch/mips/mm/page.c

+2 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ void clear_page(void *page) 
		;

	__raw_readq(IOADDR(A_DM_REGISTER(cpu, R_DM_DSCR_BASE)));

}

EXPORT_SYMBOL(clear_page);



void copy_page(void *to, void *from)

{
@@ -687,5 +688,6 @@ void copy_page(void *to, void *from) 
		;

	__raw_readq(IOADDR(A_DM_REGISTER(cpu, R_DM_DSCR_BASE)));

}

EXPORT_SYMBOL(copy_page);



#endif /* CONFIG_SIBYTE_DMA_PAGEOPS */