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

alpha: replace #include <asm/export.h> with #include <linux/export.h>

Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost")
deprecated <asm/export.h>, which is now a wrapper of <linux/export.h>.

Replace #include <asm/export.h> with #include <linux/export.h>.

After all the <asm/export.h> lines are converted, <asm/export.h> and
<asm-generic/export.h> will be removed.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Masahiro Yamada f3c78e94 b154f642

+32 -32
+1 -1
arch/alpha/lib/callback_srm.S
··· 3 3 * arch/alpha/lib/callback_srm.S 4 4 */ 5 5 6 + #include <linux/export.h> 6 7 #include <asm/console.h> 7 - #include <asm/export.h> 8 8 9 9 .text 10 10 #define HWRPB_CRB_OFFSET 0xc0
+1 -1
arch/alpha/lib/clear_page.S
··· 4 4 * 5 5 * Zero an entire page. 6 6 */ 7 - #include <asm/export.h> 7 + #include <linux/export.h> 8 8 .text 9 9 .align 4 10 10 .global clear_page
+1 -1
arch/alpha/lib/clear_user.S
··· 10 10 * a successful copy). There is also some rather minor exception setup 11 11 * stuff. 12 12 */ 13 - #include <asm/export.h> 13 + #include <linux/export.h> 14 14 15 15 /* Allow an exception for an insn; exit if we get one. */ 16 16 #define EX(x,y...) \
+1 -1
arch/alpha/lib/copy_page.S
··· 4 4 * 5 5 * Copy an entire page. 6 6 */ 7 - #include <asm/export.h> 7 + #include <linux/export.h> 8 8 .text 9 9 .align 4 10 10 .global copy_page
+1 -1
arch/alpha/lib/copy_user.S
··· 12 12 * exception setup stuff.. 13 13 */ 14 14 15 - #include <asm/export.h> 15 + #include <linux/export.h> 16 16 17 17 /* Allow an exception for an insn; exit if we get one. */ 18 18 #define EXI(x,y...) \
+1 -1
arch/alpha/lib/csum_ipv6_magic.S
··· 13 13 * added by Ivan Kokshaysky <ink@jurassic.park.msu.ru> 14 14 */ 15 15 16 - #include <asm/export.h> 16 + #include <linux/export.h> 17 17 .globl csum_ipv6_magic 18 18 .align 4 19 19 .ent csum_ipv6_magic
+1 -1
arch/alpha/lib/divide.S
··· 46 46 * $28 - compare status 47 47 */ 48 48 49 - #include <asm/export.h> 49 + #include <linux/export.h> 50 50 #define halt .long 0 51 51 52 52 /*
+1 -1
arch/alpha/lib/ev6-clear_page.S
··· 4 4 * 5 5 * Zero an entire page. 6 6 */ 7 - #include <asm/export.h> 7 + #include <linux/export.h> 8 8 .text 9 9 .align 4 10 10 .global clear_page
+1 -1
arch/alpha/lib/ev6-clear_user.S
··· 29 29 * want to leave a hole (and we also want to avoid repeating lots of work) 30 30 */ 31 31 32 - #include <asm/export.h> 32 + #include <linux/export.h> 33 33 /* Allow an exception for an insn; exit if we get one. */ 34 34 #define EX(x,y...) \ 35 35 99: x,##y; \
+1 -1
arch/alpha/lib/ev6-copy_page.S
··· 57 57 destination pages are in the dcache, but it is my guess that this is 58 58 less important than the dcache miss case. */ 59 59 60 - #include <asm/export.h> 60 + #include <linux/export.h> 61 61 .text 62 62 .align 4 63 63 .global copy_page
+1 -1
arch/alpha/lib/ev6-copy_user.S
··· 23 23 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 24 24 */ 25 25 26 - #include <asm/export.h> 26 + #include <linux/export.h> 27 27 /* Allow an exception for an insn; exit if we get one. */ 28 28 #define EXI(x,y...) \ 29 29 99: x,##y; \
+1 -1
arch/alpha/lib/ev6-csum_ipv6_magic.S
··· 53 53 * may cause additional delay in rare cases (load-load replay traps). 54 54 */ 55 55 56 - #include <asm/export.h> 56 + #include <linux/export.h> 57 57 .globl csum_ipv6_magic 58 58 .align 4 59 59 .ent csum_ipv6_magic
+1 -1
arch/alpha/lib/ev6-divide.S
··· 56 56 * Try not to change the actual algorithm if possible for consistency. 57 57 */ 58 58 59 - #include <asm/export.h> 59 + #include <linux/export.h> 60 60 #define halt .long 0 61 61 62 62 /*
+1 -1
arch/alpha/lib/ev6-memchr.S
··· 28 28 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 29 29 * Try not to change the actual algorithm if possible for consistency. 30 30 */ 31 - #include <asm/export.h> 31 + #include <linux/export.h> 32 32 .set noreorder 33 33 .set noat 34 34
+1 -1
arch/alpha/lib/ev6-memcpy.S
··· 20 20 * Temp usage notes: 21 21 * $1,$2, - scratch 22 22 */ 23 - #include <asm/export.h> 23 + #include <linux/export.h> 24 24 .set noreorder 25 25 .set noat 26 26
+1 -1
arch/alpha/lib/ev6-memset.S
··· 27 27 * as fixes will need to be made in multiple places. The performance gain 28 28 * is worth it. 29 29 */ 30 - #include <asm/export.h> 30 + #include <linux/export.h> 31 31 .set noat 32 32 .set noreorder 33 33 .text
+1 -1
arch/alpha/lib/ev67-strcat.S
··· 20 20 * string once. 21 21 */ 22 22 23 - #include <asm/export.h> 23 + #include <linux/export.h> 24 24 .text 25 25 26 26 .align 4
+1 -1
arch/alpha/lib/ev67-strchr.S
··· 16 16 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 17 17 * Try not to change the actual algorithm if possible for consistency. 18 18 */ 19 - #include <asm/export.h> 19 + #include <linux/export.h> 20 20 #include <asm/regdef.h> 21 21 22 22 .set noreorder
+1 -1
arch/alpha/lib/ev67-strlen.S
··· 18 18 * U - upper subcluster; U0 - subcluster U0; U1 - subcluster U1 19 19 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 20 20 */ 21 - #include <asm/export.h> 21 + #include <linux/export.h> 22 22 .set noreorder 23 23 .set noat 24 24
+1 -1
arch/alpha/lib/ev67-strncat.S
··· 21 21 * Try not to change the actual algorithm if possible for consistency. 22 22 */ 23 23 24 - #include <asm/export.h> 24 + #include <linux/export.h> 25 25 .text 26 26 27 27 .align 4
+1 -1
arch/alpha/lib/ev67-strrchr.S
··· 19 19 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 20 20 */ 21 21 22 - #include <asm/export.h> 22 + #include <linux/export.h> 23 23 #include <asm/regdef.h> 24 24 25 25 .set noreorder
+1 -1
arch/alpha/lib/memchr.S
··· 31 31 - only minimum number of quadwords may be accessed 32 32 - the third argument is an unsigned long 33 33 */ 34 - #include <asm/export.h> 34 + #include <linux/export.h> 35 35 .set noreorder 36 36 .set noat 37 37
+1 -1
arch/alpha/lib/memmove.S
··· 7 7 * This is hand-massaged output from the original memcpy.c. We defer to 8 8 * memcpy whenever possible; the backwards copy loops are not unrolled. 9 9 */ 10 - #include <asm/export.h> 10 + #include <linux/export.h> 11 11 .set noat 12 12 .set noreorder 13 13 .text
+1 -1
arch/alpha/lib/memset.S
··· 14 14 * The scheduling comments are according to the EV5 documentation (and done by 15 15 * hand, so they might well be incorrect, please do tell me about it..) 16 16 */ 17 - #include <asm/export.h> 17 + #include <linux/export.h> 18 18 .set noat 19 19 .set noreorder 20 20 .text
+1 -1
arch/alpha/lib/strcat.S
··· 5 5 * 6 6 * Append a null-terminated string from SRC to DST. 7 7 */ 8 - #include <asm/export.h> 8 + #include <linux/export.h> 9 9 10 10 .text 11 11
+1 -1
arch/alpha/lib/strchr.S
··· 6 6 * Return the address of a given character within a null-terminated 7 7 * string, or null if it is not found. 8 8 */ 9 - #include <asm/export.h> 9 + #include <linux/export.h> 10 10 #include <asm/regdef.h> 11 11 12 12 .set noreorder
+1 -1
arch/alpha/lib/strcpy.S
··· 6 6 * Copy a null-terminated string from SRC to DST. Return a pointer 7 7 * to the null-terminator in the source. 8 8 */ 9 - #include <asm/export.h> 9 + #include <linux/export.h> 10 10 .text 11 11 12 12 .align 3
+1 -1
arch/alpha/lib/strlen.S
··· 12 12 * do this instead of the 9 instructions that 13 13 * binary search needs). 14 14 */ 15 - #include <asm/export.h> 15 + #include <linux/export.h> 16 16 .set noreorder 17 17 .set noat 18 18
+1 -1
arch/alpha/lib/strncat.S
··· 10 10 * past count, whereas libc may write to count+1. This follows the generic 11 11 * implementation in lib/string.c and is, IMHO, more sensible. 12 12 */ 13 - #include <asm/export.h> 13 + #include <linux/export.h> 14 14 .text 15 15 16 16 .align 3
+1 -1
arch/alpha/lib/strncpy.S
··· 11 11 * version has cropped that bit o' nastiness as well as assuming that 12 12 * __stxncpy is in range of a branch. 13 13 */ 14 - #include <asm/export.h> 14 + #include <linux/export.h> 15 15 .set noat 16 16 .set noreorder 17 17
+1 -1
arch/alpha/lib/strrchr.S
··· 6 6 * Return the address of the last occurrence of a given character 7 7 * within a null-terminated string, or null if it is not found. 8 8 */ 9 - #include <asm/export.h> 9 + #include <linux/export.h> 10 10 #include <asm/regdef.h> 11 11 12 12 .set noreorder
+1 -1
arch/alpha/lib/udiv-qrnnd.S
··· 25 25 # along with GCC; see the file COPYING. If not, write to the 26 26 # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, 27 27 # MA 02111-1307, USA. 28 - #include <asm/export.h> 28 + #include <linux/export.h> 29 29 30 30 .set noreorder 31 31 .set noat