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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 'stable' of git://github.com/cmetcalf-tilera/linux-tile:
tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files

Linus Torvalds 14 years ago 95bc156c 2ad53110

+2 -2

2 changed files

expand all

arch

tile

kernel

intvec_32.S

lib

atomic_asm_32.S

+1 -1

arch/tile/kernel/intvec_32.S

··· 21 21 #include <asm/ptrace.h> 22 22 #include <asm/thread_info.h> 23 23 #include <asm/irqflags.h> 24 - #include <linux/atomic.h> 24 + #include <asm/atomic_32.h> 25 25 #include <asm/asm-offsets.h> 26 26 #include <hv/hypervisor.h> 27 27 #include <arch/abi.h>

+1 -1

arch/tile/lib/atomic_asm_32.S

··· 70 70 */ 71 71 72 72 #include <linux/linkage.h> 73 - #include <linux/atomic.h> 73 + #include <asm/atomic_32.h> 74 74 #include <asm/page.h> 75 75 #include <asm/processor.h> 76 76

Configure Feed

Configure Feed