Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: James Hogan <james.hogan@imgtec.com>

+13 -16
-16
arch/metag/kernel/metag_ksyms.c
··· 2 2 #include <linux/linkage.h> 3 3 #include <linux/string.h> 4 4 #include <linux/mm.h> 5 - #include <linux/user.h> 6 5 #include <linux/interrupt.h> 7 6 #include <linux/hardirq.h> 8 7 9 8 #include <asm/checksum.h> 10 - #include <asm/uaccess.h> 11 9 #include <asm/ftrace.h> 12 10 #include <asm/tbx.h> 13 - 14 - /* uaccess symbols */ 15 - EXPORT_SYMBOL(__copy_user_zeroing); 16 - EXPORT_SYMBOL(__copy_user); 17 - EXPORT_SYMBOL(__get_user_asm_b); 18 - EXPORT_SYMBOL(__get_user_asm_w); 19 - EXPORT_SYMBOL(__get_user_asm_d); 20 - EXPORT_SYMBOL(__put_user_asm_b); 21 - EXPORT_SYMBOL(__put_user_asm_w); 22 - EXPORT_SYMBOL(__put_user_asm_d); 23 - EXPORT_SYMBOL(__put_user_asm_l); 24 - EXPORT_SYMBOL(__strncpy_from_user); 25 - EXPORT_SYMBOL(strnlen_user); 26 - EXPORT_SYMBOL(__do_clear_user); 27 11 28 12 EXPORT_SYMBOL(clear_page); 29 13 EXPORT_SYMBOL(copy_page);
+13
arch/metag/lib/usercopy.c
··· 10 10 * Modified for Meta by Will Newton. 11 11 */ 12 12 13 + #include <linux/export.h> 13 14 #include <linux/uaccess.h> 14 15 #include <asm/cache.h> /* def of L1_CACHE_BYTES */ 15 16 ··· 611 610 612 611 return retn; 613 612 } 613 + EXPORT_SYMBOL(__copy_user); 614 614 615 615 #define __asm_copy_from_user_1(to, from, ret) \ 616 616 __asm_copy_user_cont(to, from, ret, \ ··· 938 936 939 937 return retn + n; 940 938 } 939 + EXPORT_SYMBOL(__copy_user_zeroing); 941 940 942 941 #define __asm_clear_8x64(to, ret) \ 943 942 asm volatile ( \ ··· 1092 1089 1093 1090 return retn; 1094 1091 } 1092 + EXPORT_SYMBOL(__do_clear_user); 1095 1093 1096 1094 unsigned char __get_user_asm_b(const void __user *addr, long *err) 1097 1095 { ··· 1116 1112 : "D0FrT"); 1117 1113 return x; 1118 1114 } 1115 + EXPORT_SYMBOL(__get_user_asm_b); 1119 1116 1120 1117 unsigned short __get_user_asm_w(const void __user *addr, long *err) 1121 1118 { ··· 1140 1135 : "D0FrT"); 1141 1136 return x; 1142 1137 } 1138 + EXPORT_SYMBOL(__get_user_asm_w); 1143 1139 1144 1140 unsigned int __get_user_asm_d(const void __user *addr, long *err) 1145 1141 { ··· 1164 1158 : "D0FrT"); 1165 1159 return x; 1166 1160 } 1161 + EXPORT_SYMBOL(__get_user_asm_d); 1167 1162 1168 1163 long __put_user_asm_b(unsigned int x, void __user *addr) 1169 1164 { ··· 1188 1181 : "D0FrT"); 1189 1182 return err; 1190 1183 } 1184 + EXPORT_SYMBOL(__put_user_asm_b); 1191 1185 1192 1186 long __put_user_asm_w(unsigned int x, void __user *addr) 1193 1187 { ··· 1212 1204 : "D0FrT"); 1213 1205 return err; 1214 1206 } 1207 + EXPORT_SYMBOL(__put_user_asm_w); 1215 1208 1216 1209 long __put_user_asm_d(unsigned int x, void __user *addr) 1217 1210 { ··· 1236 1227 : "D0FrT"); 1237 1228 return err; 1238 1229 } 1230 + EXPORT_SYMBOL(__put_user_asm_d); 1239 1231 1240 1232 long __put_user_asm_l(unsigned long long x, void __user *addr) 1241 1233 { ··· 1260 1250 : "D0FrT"); 1261 1251 return err; 1262 1252 } 1253 + EXPORT_SYMBOL(__put_user_asm_l); 1263 1254 1264 1255 long strnlen_user(const char __user *src, long count) 1265 1256 { ··· 1297 1286 1298 1287 return res; 1299 1288 } 1289 + EXPORT_SYMBOL(strnlen_user); 1300 1290 1301 1291 long __strncpy_from_user(char *dst, const char __user *src, long count) 1302 1292 { ··· 1351 1339 1352 1340 return res; 1353 1341 } 1342 + EXPORT_SYMBOL(__strncpy_from_user);