Messages in this thread Patch in this message | | | From | Chris Metcalf <> | Date | Wed, 10 Aug 2011 13:53:02 -0400 | Subject | [PATCH] arch/tile: use #include <asm/atomic.h> in tilepro assembly files |
| |
The standard <linux/atomic.h> is not safe to include from assembly, and in general there's no need for it to be, since it's not very meaningful for assembly code.
Assembly support in tilepro for atomics does need to get some constants from the tilepro <asm/atomic.h>, however, so fix those files back to the way they were, to directly #include <asm/atomic.h>.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> --- arch/tile/kernel/intvec_32.S | 2 +- arch/tile/lib/atomic_asm_32.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S index fc94607..72ade79 100644 --- a/arch/tile/kernel/intvec_32.S +++ b/arch/tile/kernel/intvec_32.S @@ -21,7 +21,7 @@ #include <asm/ptrace.h> #include <asm/thread_info.h> #include <asm/irqflags.h> -#include <linux/atomic.h> +#include <asm/atomic.h> #include <asm/asm-offsets.h> #include <hv/hypervisor.h> #include <arch/abi.h> diff --git a/arch/tile/lib/atomic_asm_32.S b/arch/tile/lib/atomic_asm_32.S index 1f75a2a..2444873 100644 --- a/arch/tile/lib/atomic_asm_32.S +++ b/arch/tile/lib/atomic_asm_32.S @@ -70,7 +70,7 @@ */ #include <linux/linkage.h> -#include <linux/atomic.h> +#include <asm/atomic.h> #include <asm/page.h> #include <asm/processor.h> -- 1.6.5.2
| |