Skip to content

Commit

Permalink
alpha: replace #include <asm/export.h> with #include <linux/export.h>
Browse files Browse the repository at this point in the history
Commit ddb5cdb ("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>
  • Loading branch information
Masahiro Yamada committed Aug 22, 2023
1 parent b154f64 commit f3c78e9
Show file tree
Hide file tree
Showing 32 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion arch/alpha/lib/callback_srm.S
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* arch/alpha/lib/callback_srm.S
*/

#include <linux/export.h>
#include <asm/console.h>
#include <asm/export.h>

.text
#define HWRPB_CRB_OFFSET 0xc0
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/clear_page.S
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Zero an entire page.
*/
#include <asm/export.h>
#include <linux/export.h>
.text
.align 4
.global clear_page
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/clear_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* a successful copy). There is also some rather minor exception setup
* stuff.
*/
#include <asm/export.h>
#include <linux/export.h>

/* Allow an exception for an insn; exit if we get one. */
#define EX(x,y...) \
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/copy_page.S
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Copy an entire page.
*/
#include <asm/export.h>
#include <linux/export.h>
.text
.align 4
.global copy_page
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/copy_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* exception setup stuff..
*/

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

/* Allow an exception for an insn; exit if we get one. */
#define EXI(x,y...) \
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/csum_ipv6_magic.S
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* added by Ivan Kokshaysky <ink@jurassic.park.msu.ru>
*/

#include <asm/export.h>
#include <linux/export.h>
.globl csum_ipv6_magic
.align 4
.ent csum_ipv6_magic
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/divide.S
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
* $28 - compare status
*/

#include <asm/export.h>
#include <linux/export.h>
#define halt .long 0

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-clear_page.S
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Zero an entire page.
*/
#include <asm/export.h>
#include <linux/export.h>
.text
.align 4
.global clear_page
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-clear_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* want to leave a hole (and we also want to avoid repeating lots of work)
*/

#include <asm/export.h>
#include <linux/export.h>
/* Allow an exception for an insn; exit if we get one. */
#define EX(x,y...) \
99: x,##y; \
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-copy_page.S
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
destination pages are in the dcache, but it is my guess that this is
less important than the dcache miss case. */

#include <asm/export.h>
#include <linux/export.h>
.text
.align 4
.global copy_page
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-copy_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1
*/

#include <asm/export.h>
#include <linux/export.h>
/* Allow an exception for an insn; exit if we get one. */
#define EXI(x,y...) \
99: x,##y; \
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-csum_ipv6_magic.S
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* may cause additional delay in rare cases (load-load replay traps).
*/

#include <asm/export.h>
#include <linux/export.h>
.globl csum_ipv6_magic
.align 4
.ent csum_ipv6_magic
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-divide.S
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* Try not to change the actual algorithm if possible for consistency.
*/

#include <asm/export.h>
#include <linux/export.h>
#define halt .long 0

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-memchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1
* Try not to change the actual algorithm if possible for consistency.
*/
#include <asm/export.h>
#include <linux/export.h>
.set noreorder
.set noat

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-memcpy.S
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Temp usage notes:
* $1,$2, - scratch
*/
#include <asm/export.h>
#include <linux/export.h>
.set noreorder
.set noat

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev6-memset.S
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* as fixes will need to be made in multiple places. The performance gain
* is worth it.
*/
#include <asm/export.h>
#include <linux/export.h>
.set noat
.set noreorder
.text
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev67-strcat.S
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* string once.
*/

#include <asm/export.h>
#include <linux/export.h>
.text

.align 4
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev67-strchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1
* Try not to change the actual algorithm if possible for consistency.
*/
#include <asm/export.h>
#include <linux/export.h>
#include <asm/regdef.h>

.set noreorder
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev67-strlen.S
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* U - upper subcluster; U0 - subcluster U0; U1 - subcluster U1
* L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1
*/
#include <asm/export.h>
#include <linux/export.h>
.set noreorder
.set noat

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev67-strncat.S
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* Try not to change the actual algorithm if possible for consistency.
*/

#include <asm/export.h>
#include <linux/export.h>
.text

.align 4
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/ev67-strrchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1
*/

#include <asm/export.h>
#include <linux/export.h>
#include <asm/regdef.h>

.set noreorder
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/memchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ For correctness consider that:
- only minimum number of quadwords may be accessed
- the third argument is an unsigned long
*/
#include <asm/export.h>
#include <linux/export.h>
.set noreorder
.set noat

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/memmove.S
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This is hand-massaged output from the original memcpy.c. We defer to
* memcpy whenever possible; the backwards copy loops are not unrolled.
*/
#include <asm/export.h>
#include <linux/export.h>
.set noat
.set noreorder
.text
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/memset.S
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* The scheduling comments are according to the EV5 documentation (and done by
* hand, so they might well be incorrect, please do tell me about it..)
*/
#include <asm/export.h>
#include <linux/export.h>
.set noat
.set noreorder
.text
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strcat.S
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Append a null-terminated string from SRC to DST.
*/
#include <asm/export.h>
#include <linux/export.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Return the address of a given character within a null-terminated
* string, or null if it is not found.
*/
#include <asm/export.h>
#include <linux/export.h>
#include <asm/regdef.h>

.set noreorder
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strcpy.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copy a null-terminated string from SRC to DST. Return a pointer
* to the null-terminator in the source.
*/
#include <asm/export.h>
#include <linux/export.h>
.text

.align 3
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strlen.S
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* do this instead of the 9 instructions that
* binary search needs).
*/
#include <asm/export.h>
#include <linux/export.h>
.set noreorder
.set noat

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strncat.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* past count, whereas libc may write to count+1. This follows the generic
* implementation in lib/string.c and is, IMHO, more sensible.
*/
#include <asm/export.h>
#include <linux/export.h>
.text

.align 3
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strncpy.S
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* version has cropped that bit o' nastiness as well as assuming that
* __stxncpy is in range of a branch.
*/
#include <asm/export.h>
#include <linux/export.h>
.set noat
.set noreorder

Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/strrchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Return the address of the last occurrence of a given character
* within a null-terminated string, or null if it is not found.
*/
#include <asm/export.h>
#include <linux/export.h>
#include <asm/regdef.h>

.set noreorder
Expand Down
2 changes: 1 addition & 1 deletion arch/alpha/lib/udiv-qrnnd.S
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# along with GCC; see the file COPYING. If not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
#include <asm/export.h>
#include <linux/export.h>

.set noreorder
.set noat
Expand Down

0 comments on commit f3c78e9

Please sign in to comment.