diff options
Diffstat (limited to 'arch/xtensa/lib')
| -rw-r--r-- | arch/xtensa/lib/checksum.S | 3 | ||||
| -rw-r--r-- | arch/xtensa/lib/memcopy.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/memset.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/strncpy_user.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/strnlen_user.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/usercopy.S | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/arch/xtensa/lib/checksum.S b/arch/xtensa/lib/checksum.S index e2d64dfd530c..9d9cd990afa6 100644 --- a/arch/xtensa/lib/checksum.S +++ b/arch/xtensa/lib/checksum.S | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm/errno.h> | 17 | #include <asm/errno.h> |
| 18 | #include <linux/linkage.h> | 18 | #include <linux/linkage.h> |
| 19 | #define _ASMLANGUAGE | 19 | #include <asm/variant/core.h> |
| 20 | #include <xtensa/config/core.h> | ||
| 21 | 20 | ||
| 22 | /* | 21 | /* |
| 23 | * computes a partial checksum, e.g. for TCP/UDP fragments | 22 | * computes a partial checksum, e.g. for TCP/UDP fragments |
diff --git a/arch/xtensa/lib/memcopy.S b/arch/xtensa/lib/memcopy.S index e8f6d7eb7222..ddda8f4bc862 100644 --- a/arch/xtensa/lib/memcopy.S +++ b/arch/xtensa/lib/memcopy.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * Copyright (C) 2002 - 2005 Tensilica Inc. | 9 | * Copyright (C) 2002 - 2005 Tensilica Inc. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <xtensa/coreasm.h> | 12 | #include <asm/variant/core.h> |
| 13 | 13 | ||
| 14 | .macro src_b r, w0, w1 | 14 | .macro src_b r, w0, w1 |
| 15 | #ifdef __XTENSA_EB__ | 15 | #ifdef __XTENSA_EB__ |
diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S index 4de25134bc62..56a17495b2db 100644 --- a/arch/xtensa/lib/memset.S +++ b/arch/xtensa/lib/memset.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Copyright (C) 2002 Tensilica Inc. | 11 | * Copyright (C) 2002 Tensilica Inc. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <xtensa/coreasm.h> | 14 | #include <asm/variant/core.h> |
| 15 | 15 | ||
| 16 | /* | 16 | /* |
| 17 | * void *memset(void *dst, int c, size_t length) | 17 | * void *memset(void *dst, int c, size_t length) |
diff --git a/arch/xtensa/lib/strncpy_user.S b/arch/xtensa/lib/strncpy_user.S index 71d55df43893..a834057bda6b 100644 --- a/arch/xtensa/lib/strncpy_user.S +++ b/arch/xtensa/lib/strncpy_user.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Copyright (C) 2002 Tensilica Inc. | 11 | * Copyright (C) 2002 Tensilica Inc. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <xtensa/coreasm.h> | 14 | #include <asm/variant/core.h> |
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | 16 | ||
| 17 | /* Load or store instructions that may cause exceptions use the EX macro. */ | 17 | /* Load or store instructions that may cause exceptions use the EX macro. */ |
diff --git a/arch/xtensa/lib/strnlen_user.S b/arch/xtensa/lib/strnlen_user.S index cdff4d670f3b..5e9c1e709b2e 100644 --- a/arch/xtensa/lib/strnlen_user.S +++ b/arch/xtensa/lib/strnlen_user.S | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Copyright (C) 2002 Tensilica Inc. | 11 | * Copyright (C) 2002 Tensilica Inc. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <xtensa/coreasm.h> | 14 | #include <asm/variant/core.h> |
| 15 | 15 | ||
| 16 | /* Load or store instructions that may cause exceptions use the EX macro. */ | 16 | /* Load or store instructions that may cause exceptions use the EX macro. */ |
| 17 | 17 | ||
diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S index 4641ef510f0e..a8ab1d4fe0ae 100644 --- a/arch/xtensa/lib/usercopy.S +++ b/arch/xtensa/lib/usercopy.S | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | * a11/ original length | 53 | * a11/ original length |
| 54 | */ | 54 | */ |
| 55 | 55 | ||
| 56 | #include <xtensa/coreasm.h> | 56 | #include <asm/variant/core.h> |
| 57 | 57 | ||
| 58 | #ifdef __XTENSA_EB__ | 58 | #ifdef __XTENSA_EB__ |
| 59 | #define ALIGN(R, W0, W1) src R, W0, W1 | 59 | #define ALIGN(R, W0, W1) src R, W0, W1 |