diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 00:59:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-14 00:59:11 -0400 |
| commit | 95bc156c62a57cda1b225e03ae23eb2764ee1046 (patch) | |
| tree | 8307f64b3727db3ca51c71d8f0a03e6b024721be /arch | |
| parent | 2ad53110d654c7c9a80dcea341f4117246c1b6f9 (diff) | |
| parent | d52104b29a3735f2b4dceefcb01b19d370a783ea (diff) | |
Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile
* 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/kernel/intvec_32.S | 2 | ||||
| -rw-r--r-- | 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 fc94607f0bd5..aecc8ed5f39b 100644 --- a/arch/tile/kernel/intvec_32.S +++ b/arch/tile/kernel/intvec_32.S | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
| 22 | #include <asm/thread_info.h> | 22 | #include <asm/thread_info.h> |
| 23 | #include <asm/irqflags.h> | 23 | #include <asm/irqflags.h> |
| 24 | #include <linux/atomic.h> | 24 | #include <asm/atomic_32.h> |
| 25 | #include <asm/asm-offsets.h> | 25 | #include <asm/asm-offsets.h> |
| 26 | #include <hv/hypervisor.h> | 26 | #include <hv/hypervisor.h> |
| 27 | #include <arch/abi.h> | 27 | #include <arch/abi.h> |
diff --git a/arch/tile/lib/atomic_asm_32.S b/arch/tile/lib/atomic_asm_32.S index 1f75a2a56101..30638042691d 100644 --- a/arch/tile/lib/atomic_asm_32.S +++ b/arch/tile/lib/atomic_asm_32.S | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | */ | 70 | */ |
| 71 | 71 | ||
| 72 | #include <linux/linkage.h> | 72 | #include <linux/linkage.h> |
| 73 | #include <linux/atomic.h> | 73 | #include <asm/atomic_32.h> |
| 74 | #include <asm/page.h> | 74 | #include <asm/page.h> |
| 75 | #include <asm/processor.h> | 75 | #include <asm/processor.h> |
| 76 | 76 | ||