Commit 9da3ee9a authored by James Hogan's avatar James Hogan

metag: move usercopy.c exports out of metag_ksyms.c

It's less error prone to have function symbols exported immediately
after the function rather than in metag_ksyms.c. Move each EXPORT_SYMBOL
in metag_ksyms.c for symbols defined in usercopy.c into usercopy.c
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
parent 7293dbed
...@@ -2,29 +2,13 @@ ...@@ -2,29 +2,13 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/user.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <asm/checksum.h> #include <asm/checksum.h>
#include <asm/uaccess.h>
#include <asm/ftrace.h> #include <asm/ftrace.h>
#include <asm/tbx.h> #include <asm/tbx.h>
/* uaccess symbols */
EXPORT_SYMBOL(__copy_user_zeroing);
EXPORT_SYMBOL(__copy_user);
EXPORT_SYMBOL(__get_user_asm_b);
EXPORT_SYMBOL(__get_user_asm_w);
EXPORT_SYMBOL(__get_user_asm_d);
EXPORT_SYMBOL(__put_user_asm_b);
EXPORT_SYMBOL(__put_user_asm_w);
EXPORT_SYMBOL(__put_user_asm_d);
EXPORT_SYMBOL(__put_user_asm_l);
EXPORT_SYMBOL(__strncpy_from_user);
EXPORT_SYMBOL(strnlen_user);
EXPORT_SYMBOL(__do_clear_user);
EXPORT_SYMBOL(clear_page); EXPORT_SYMBOL(clear_page);
EXPORT_SYMBOL(copy_page); EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(empty_zero_page); EXPORT_SYMBOL(empty_zero_page);
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* Modified for Meta by Will Newton. * Modified for Meta by Will Newton.
*/ */
#include <linux/export.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/cache.h> /* def of L1_CACHE_BYTES */ #include <asm/cache.h> /* def of L1_CACHE_BYTES */
...@@ -610,6 +611,7 @@ unsigned long __copy_user(void __user *pdst, const void *psrc, ...@@ -610,6 +611,7 @@ unsigned long __copy_user(void __user *pdst, const void *psrc,
return retn; return retn;
} }
EXPORT_SYMBOL(__copy_user);
#define __asm_copy_from_user_1(to, from, ret) \ #define __asm_copy_from_user_1(to, from, ret) \
__asm_copy_user_cont(to, from, ret, \ __asm_copy_user_cont(to, from, ret, \
...@@ -936,6 +938,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc, ...@@ -936,6 +938,7 @@ unsigned long __copy_user_zeroing(void *pdst, const void __user *psrc,
return retn + n; return retn + n;
} }
EXPORT_SYMBOL(__copy_user_zeroing);
#define __asm_clear_8x64(to, ret) \ #define __asm_clear_8x64(to, ret) \
asm volatile ( \ asm volatile ( \
...@@ -1089,6 +1092,7 @@ unsigned long __do_clear_user(void __user *pto, unsigned long pn) ...@@ -1089,6 +1092,7 @@ unsigned long __do_clear_user(void __user *pto, unsigned long pn)
return retn; return retn;
} }
EXPORT_SYMBOL(__do_clear_user);
unsigned char __get_user_asm_b(const void __user *addr, long *err) unsigned char __get_user_asm_b(const void __user *addr, long *err)
{ {
...@@ -1112,6 +1116,7 @@ unsigned char __get_user_asm_b(const void __user *addr, long *err) ...@@ -1112,6 +1116,7 @@ unsigned char __get_user_asm_b(const void __user *addr, long *err)
: "D0FrT"); : "D0FrT");
return x; return x;
} }
EXPORT_SYMBOL(__get_user_asm_b);
unsigned short __get_user_asm_w(const void __user *addr, long *err) unsigned short __get_user_asm_w(const void __user *addr, long *err)
{ {
...@@ -1135,6 +1140,7 @@ unsigned short __get_user_asm_w(const void __user *addr, long *err) ...@@ -1135,6 +1140,7 @@ unsigned short __get_user_asm_w(const void __user *addr, long *err)
: "D0FrT"); : "D0FrT");
return x; return x;
} }
EXPORT_SYMBOL(__get_user_asm_w);
unsigned int __get_user_asm_d(const void __user *addr, long *err) unsigned int __get_user_asm_d(const void __user *addr, long *err)
{ {
...@@ -1158,6 +1164,7 @@ unsigned int __get_user_asm_d(const void __user *addr, long *err) ...@@ -1158,6 +1164,7 @@ unsigned int __get_user_asm_d(const void __user *addr, long *err)
: "D0FrT"); : "D0FrT");
return x; return x;
} }
EXPORT_SYMBOL(__get_user_asm_d);
long __put_user_asm_b(unsigned int x, void __user *addr) long __put_user_asm_b(unsigned int x, void __user *addr)
{ {
...@@ -1181,6 +1188,7 @@ long __put_user_asm_b(unsigned int x, void __user *addr) ...@@ -1181,6 +1188,7 @@ long __put_user_asm_b(unsigned int x, void __user *addr)
: "D0FrT"); : "D0FrT");
return err; return err;
} }
EXPORT_SYMBOL(__put_user_asm_b);
long __put_user_asm_w(unsigned int x, void __user *addr) long __put_user_asm_w(unsigned int x, void __user *addr)
{ {
...@@ -1204,6 +1212,7 @@ long __put_user_asm_w(unsigned int x, void __user *addr) ...@@ -1204,6 +1212,7 @@ long __put_user_asm_w(unsigned int x, void __user *addr)
: "D0FrT"); : "D0FrT");
return err; return err;
} }
EXPORT_SYMBOL(__put_user_asm_w);
long __put_user_asm_d(unsigned int x, void __user *addr) long __put_user_asm_d(unsigned int x, void __user *addr)
{ {
...@@ -1227,6 +1236,7 @@ long __put_user_asm_d(unsigned int x, void __user *addr) ...@@ -1227,6 +1236,7 @@ long __put_user_asm_d(unsigned int x, void __user *addr)
: "D0FrT"); : "D0FrT");
return err; return err;
} }
EXPORT_SYMBOL(__put_user_asm_d);
long __put_user_asm_l(unsigned long long x, void __user *addr) long __put_user_asm_l(unsigned long long x, void __user *addr)
{ {
...@@ -1250,6 +1260,7 @@ long __put_user_asm_l(unsigned long long x, void __user *addr) ...@@ -1250,6 +1260,7 @@ long __put_user_asm_l(unsigned long long x, void __user *addr)
: "D0FrT"); : "D0FrT");
return err; return err;
} }
EXPORT_SYMBOL(__put_user_asm_l);
long strnlen_user(const char __user *src, long count) long strnlen_user(const char __user *src, long count)
{ {
...@@ -1286,6 +1297,7 @@ long strnlen_user(const char __user *src, long count) ...@@ -1286,6 +1297,7 @@ long strnlen_user(const char __user *src, long count)
return res; return res;
} }
EXPORT_SYMBOL(strnlen_user);
long __strncpy_from_user(char *dst, const char __user *src, long count) long __strncpy_from_user(char *dst, const char __user *src, long count)
{ {
...@@ -1339,3 +1351,4 @@ long __strncpy_from_user(char *dst, const char __user *src, long count) ...@@ -1339,3 +1351,4 @@ long __strncpy_from_user(char *dst, const char __user *src, long count)
return res; return res;
} }
EXPORT_SYMBOL(__strncpy_from_user);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment