]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arch/tile: use #include <asm/atomic.h> in tilepro assembly files
authorChris Metcalf <cmetcalf@tilera.com>
Wed, 10 Aug 2011 17:53:02 +0000 (13:53 -0400)
committerChris Metcalf <cmetcalf@tilera.com>
Wed, 10 Aug 2011 18:33:36 +0000 (14:33 -0400)
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
arch/tile/lib/atomic_asm_32.S

index fc94607f0bd50c8d5cdbf9f98bfcd42b26b51b03..72ade79b621bcd8b23ec44650e3d4af4fdbf0b66 100644 (file)
@@ -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>
index 1f75a2a561011220f27b9d97cd27bd4f78567ea2..24448734f6f17c3f70f95f4252afbf98c5dcce00 100644 (file)
@@ -70,7 +70,7 @@
  */
 
 #include <linux/linkage.h>
-#include <linux/atomic.h>
+#include <asm/atomic.h>
 #include <asm/page.h>
 #include <asm/processor.h>