lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile

Browse Source 
* 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
  tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
This commit is contained in:
Linus Torvalds
2011-10-14 16:59:11 +12:00
parent 2ad53110d6 d52104b29a
commit 95bc156c62
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/tile/kernel/intvec_32.S
View File

@@ -21,7 +21,7 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/irqflags.h> #include <asm/irqflags.h>
#include <linux/atomic.h> #include <asm/atomic_32.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <hv/hypervisor.h> #include <hv/hypervisor.h>
#include <arch/abi.h> #include <arch/abi.h>

2
arch/tile/lib/atomic_asm_32.S
View File

@@ -70,7 +70,7 @@
*/ */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/atomic.h> #include <asm/atomic_32.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/processor.h> #include <asm/processor.h>