Skip to content
This repository
Browse code

atomic: use <linux/atomic.h>

This allows us to move duplicated code in <asm/atomic.h>
(atomic_inc_not_zero() for now) to <linux/atomic.h>

Signed-off-by: Arun Sharma <asharma@fb.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information...
commit 60063497a95e716c9a689af3be2687d261f115b4 1 parent 148817b
authored July 26, 2011 torvalds committed July 26, 2011

Showing 301 changed files with 281 additions and 309 deletions. Show diff stats Hide diff stats

  1. 1  arch/alpha/include/asm/atomic.h
  2. 2  arch/alpha/include/asm/local.h
  3. 2  arch/alpha/kernel/perf_event.c
  4. 2  arch/alpha/kernel/smp.c
  5. 2  arch/alpha/lib/dec_and_lock.c
  6. 1  arch/arm/include/asm/atomic.h
  7. 2  arch/arm/kernel/smp.c
  8. 2  arch/arm/kernel/traps.c
  9. 2  arch/arm/mach-at91/pm.c
  10. 2  arch/arm/mach-bcmring/dma.c
  11. 2  arch/arm/mach-cns3xxx/include/mach/pm.h
  12. 2  arch/arm/mach-cns3xxx/pm.c
  13. 2  arch/arm/mach-omap1/pm.c
  14. 2  arch/arm/mach-s3c2440/clock.c
  15. 2  arch/arm/mach-s3c2440/s3c2442.c
  16. 2  arch/arm/mach-s3c2440/s3c244x-clock.c
  17. 1  arch/avr32/include/asm/atomic.h
  18. 1  arch/blackfin/include/asm/atomic.h
  19. 2  arch/blackfin/include/asm/dma.h
  20. 2  arch/blackfin/include/asm/ipipe.h
  21. 2  arch/blackfin/include/asm/spinlock.h
  22. 2  arch/blackfin/kernel/ftrace.c
  23. 2  arch/blackfin/kernel/ipipe.c
  24. 2  arch/blackfin/kernel/nmi.c
  25. 2  arch/blackfin/mach-common/smp.c
  26. 2  arch/cris/arch-v32/drivers/cryptocop.c
  27. 2  arch/cris/arch-v32/kernel/smp.c
  28. 1  arch/cris/include/asm/atomic.h
  29. 2  arch/cris/include/asm/bitops.h
  30. 2  arch/cris/kernel/process.c
  31. 1  arch/frv/include/asm/atomic.h
  32. 2  arch/frv/include/asm/hardirq.h
  33. 2  arch/frv/kernel/irq.c
  34. 1  arch/h8300/include/asm/atomic.h
  35. 1  arch/ia64/include/asm/atomic.h
  36. 2  arch/ia64/include/asm/processor.h
  37. 2  arch/ia64/include/asm/spinlock.h
  38. 2  arch/ia64/kernel/smp.c
  39. 2  arch/ia64/kernel/smpboot.c
  40. 2  arch/ia64/kernel/uncached.c
  41. 1  arch/m32r/include/asm/atomic.h
  42. 2  arch/m32r/include/asm/mmu_context.h
  43. 2  arch/m32r/include/asm/spinlock.h
  44. 2  arch/m32r/kernel/smp.c
  45. 2  arch/m32r/kernel/traps.c
  46. 1  arch/m68k/include/asm/atomic.h
  47. 2  arch/microblaze/include/asm/mmu_context_mm.h
  48. 2  arch/microblaze/include/asm/prom.h
  49. 1  arch/mips/include/asm/atomic.h
  50. 2  arch/mips/include/asm/hw_irq.h
  51. 2  arch/mips/include/asm/local.h
  52. 2  arch/mips/include/asm/smp.h
  53. 2  arch/mips/kernel/irq.c
  54. 2  arch/mips/kernel/mips-mt.c
  55. 2  arch/mips/kernel/rtlx.c
  56. 2  arch/mips/kernel/smp-cmp.c
  57. 2  arch/mips/kernel/smp-mt.c
  58. 2  arch/mips/kernel/smp.c
  59. 2  arch/mips/kernel/smtc-proc.c
  60. 2  arch/mips/kernel/smtc.c
  61. 2  arch/mips/kernel/sync-r4k.c
  62. 2  arch/mips/kernel/vpe.c
  63. 2  arch/mips/mipssim/sim_smtc.c
  64. 2  arch/mips/sgi-ip27/ip27-nmi.c
  65. 1  arch/mn10300/include/asm/atomic.h
  66. 2  arch/mn10300/include/asm/mmu_context.h
  67. 2  arch/mn10300/include/asm/spinlock.h
  68. 2  arch/mn10300/include/asm/system.h
  69. 2  arch/mn10300/kernel/mn10300-watchdog.c
  70. 2  arch/mn10300/kernel/traps.c
  71. 2  arch/mn10300/mm/misalignment.c
  72. 2  arch/mn10300/proc-mn2ws0050/proc-init.c
  73. 1  arch/parisc/include/asm/atomic.h
  74. 2  arch/parisc/include/asm/bitops.h
  75. 2  arch/parisc/include/asm/mmu_context.h
  76. 2  arch/parisc/kernel/parisc_ksyms.c
  77. 2  arch/parisc/kernel/smp.c
  78. 2  arch/parisc/kernel/traps.c
  79. 2  arch/parisc/lib/bitops.c
  80. 1  arch/powerpc/include/asm/atomic.h
  81. 2  arch/powerpc/include/asm/emulated_ops.h
  82. 2  arch/powerpc/include/asm/irq.h
  83. 2  arch/powerpc/include/asm/local.h
  84. 2  arch/powerpc/include/asm/prom.h
  85. 2  arch/powerpc/kernel/of_platform.c
  86. 2  arch/powerpc/kernel/ppc_ksyms.c
  87. 2  arch/powerpc/kernel/rtas.c
  88. 2  arch/powerpc/kernel/rtasd.c
  89. 2  arch/powerpc/kernel/smp-tbsync.c
  90. 2  arch/powerpc/kernel/smp.c
  91. 2  arch/powerpc/platforms/83xx/km83xx.c
  92. 2  arch/powerpc/platforms/83xx/mpc832x_mds.c
  93. 2  arch/powerpc/platforms/83xx/mpc834x_itx.c
  94. 2  arch/powerpc/platforms/83xx/mpc834x_mds.c
  95. 2  arch/powerpc/platforms/83xx/mpc836x_mds.c
  96. 2  arch/powerpc/platforms/83xx/sbc834x.c
  97. 2  arch/powerpc/platforms/85xx/mpc85xx_cds.c
  98. 2  arch/powerpc/platforms/85xx/mpc85xx_mds.c
  99. 2  arch/powerpc/platforms/85xx/sbc8548.c
  100. 2  arch/powerpc/platforms/cell/cpufreq_spudemand.c
  101. 2  arch/powerpc/platforms/cell/smp.c
  102. 2  arch/powerpc/platforms/cell/spufs/context.c
  103. 2  arch/powerpc/platforms/chrp/smp.c
  104. 2  arch/powerpc/platforms/iseries/smp.c
  105. 2  arch/powerpc/platforms/powermac/backlight.c
  106. 2  arch/powerpc/platforms/powermac/smp.c
  107. 2  arch/powerpc/platforms/pseries/eeh.c
  108. 2  arch/powerpc/platforms/pseries/eeh_cache.c
  109. 2  arch/powerpc/platforms/pseries/smp.c
  110. 2  arch/powerpc/sysdev/fsl_soc.c
  111. 2  arch/powerpc/sysdev/tsi108_dev.c
  112. 1  arch/s390/include/asm/atomic.h
  113. 2  arch/s390/kernel/dis.c
  114. 2  arch/s390/kernel/traps.c
  115. 1  arch/sh/include/asm/atomic.h
  116. 2  arch/sh/include/asm/hw_irq.h
  117. 2  arch/sh/include/asm/smp.h
  118. 2  arch/sh/kernel/idle.c
  119. 2  arch/sh/kernel/smp.c
  120. 2  arch/sh/kernel/traps_64.c
  121. 2  arch/sh/kernel/unwinder.c
  122. 1  arch/sparc/include/asm/atomic_32.h
  123. 1  arch/sparc/include/asm/atomic_64.h
  124. 2  arch/sparc/include/asm/prom.h
  125. 2  arch/sparc/include/asm/smp_32.h
  126. 2  arch/sparc/include/asm/smp_64.h
  127. 2  arch/sparc/kernel/irq_64.c
  128. 2  arch/sparc/kernel/leon_smp.c
  129. 2  arch/sparc/kernel/perf_event.c
  130. 2  arch/sparc/kernel/smp_32.c
  131. 2  arch/sparc/kernel/smp_64.c
  132. 2  arch/sparc/lib/atomic32.c
  133. 9  arch/tile/include/asm/atomic.h
  134. 4  arch/tile/include/asm/atomic_32.h
  135. 2  arch/tile/include/asm/atomic_64.h
  136. 2  arch/tile/include/asm/bitops_32.h
  137. 2  arch/tile/include/asm/bitops_64.h
  138. 2  arch/tile/include/asm/spinlock_32.h
  139. 2  arch/tile/kernel/intvec_32.S
  140. 2  arch/tile/lib/atomic_32.c
  141. 2  arch/tile/lib/atomic_asm_32.S
  142. 2  arch/x86/ia32/sys_ia32.c
  143. 2  arch/x86/include/asm/apic.h
  144. 1  arch/x86/include/asm/atomic.h
  145. 2  arch/x86/include/asm/hw_irq.h
  146. 2  arch/x86/include/asm/local.h
  147. 2  arch/x86/include/asm/mce.h
  148. 2  arch/x86/include/asm/mmu_context.h
  149. 2  arch/x86/include/asm/prom.h
  150. 2  arch/x86/include/asm/spinlock.h
  151. 2  arch/x86/include/asm/thread_info.h
  152. 2  arch/x86/kernel/amd_gart_64.c
  153. 2  arch/x86/kernel/apic/apic.c
  154. 2  arch/x86/kernel/apic/es7000_32.c
  155. 2  arch/x86/kernel/cpu/common.c
  156. 2  arch/x86/kernel/i8259.c
  157. 2  arch/x86/kernel/irqinit.c
  158. 2  arch/x86/kernel/traps.c
  159. 2  arch/x86/kvm/lapic.c
  160. 2  arch/x86/kvm/timer.c
  161. 2  arch/x86/lib/atomic64_32.c
  162. 2  arch/x86/mm/mmio-mod.c
  163. 1  arch/xtensa/include/asm/atomic.h
  164. 2  arch/xtensa/kernel/process.c
  165. 2  crypto/af_alg.c
  166. 2  crypto/proc.c
  167. 2  crypto/rng.c
  168. 2  drivers/atm/ambassador.c
  169. 2  drivers/atm/atmtcp.c
  170. 2  drivers/atm/eni.c
  171. 2  drivers/atm/eni.h
  172. 2  drivers/atm/firestream.c
  173. 2  drivers/atm/fore200e.c
  174. 2  drivers/atm/horizon.c
  175. 2  drivers/atm/idt77252.c
  176. 2  drivers/atm/iphase.c
  177. 2  drivers/atm/nicstar.c
  178. 2  drivers/atm/suni.c
  179. 2  drivers/atm/uPD98402.c
  180. 2  drivers/atm/zatm.c
  181. 2  drivers/base/memory.c
  182. 2  drivers/base/power/sysfs.c
  183. 2  drivers/block/cciss_scsi.c
  184. 2  drivers/char/ipmi/ipmi_watchdog.c
  185. 2  drivers/char/mspec.c
  186. 3  drivers/connector/cn_proc.c
  187. 2  drivers/edac/edac_stub.c
  188. 2  drivers/firewire/core-card.c
  189. 2  drivers/firewire/core-device.c
  190. 2  drivers/firewire/core-topology.c
  191. 2  drivers/firewire/core.h
  192. 2  drivers/firewire/nosy.c
  193. 2  drivers/gpu/drm/radeon/radeon.h
  194. 2  drivers/gpu/drm/radeon/radeon_fence.c
  195. 2  drivers/gpu/drm/ttm/ttm_bo.c
  196. 2  drivers/gpu/drm/ttm/ttm_lock.c
  197. 2  drivers/gpu/drm/ttm/ttm_object.c
  198. 2  drivers/gpu/drm/ttm/ttm_page_alloc.c
  199. 2  drivers/hwmon/sht15.c
  200. 2  drivers/infiniband/hw/cxgb4/mem.c
  201. 2  drivers/infiniband/hw/ehca/ehca_tools.h
  202. 2  drivers/infiniband/hw/nes/nes_cm.c
  203. 2  drivers/infiniband/ulp/ipoib/ipoib.h
  204. 2  drivers/infiniband/ulp/srp/ib_srp.c
  205. 2  drivers/isdn/gigaset/gigaset.h
  206. 2  drivers/md/dm-crypt.c
  207. 2  drivers/md/dm-kcopyd.c
  208. 2  drivers/md/dm-mpath.c
  209. 2  drivers/md/dm-queue-length.c
  210. 2  drivers/md/dm-table.c
  211. 2  drivers/media/video/hdpvr/hdpvr-core.c
  212. 2  drivers/media/video/tlg2300/pd-dvb.c
  213. 2  drivers/media/video/uvc/uvc_ctrl.c
  214. 2  drivers/media/video/uvc/uvc_queue.c
  215. 2  drivers/media/video/uvc/uvc_v4l2.c
  216. 2  drivers/media/video/uvc/uvc_video.c
  217. 2  drivers/message/i2o/i2o_scsi.c
  218. 2  drivers/misc/phantom.c
  219. 2  drivers/net/atlx/atl1.c
  220. 2  drivers/net/atlx/atl2.c
  221. 2  drivers/net/atlx/atl2.h
  222. 2  drivers/net/cassini.c
  223. 2  drivers/net/cpmac.c
  224. 2  drivers/net/cxgb3/cxgb3_offload.c
  225. 2  drivers/net/cxgb3/l2t.h
  226. 2  drivers/net/cxgb3/t3cdev.h
  227. 2  drivers/net/cxgb4/cxgb4_uld.h
  228. 2  drivers/net/cxgb4/l2t.h
  229. 2  drivers/net/hamradio/6pack.c
  230. 2  drivers/net/hamradio/dmascc.c
  231. 2  drivers/net/ibmveth.c
  232. 2  drivers/net/phy/phy.c
  233. 2  drivers/net/ppp_generic.c
  234. 2  drivers/net/wimax/i2400m/i2400m.h
  235. 2  drivers/net/wireless/b43legacy/b43legacy.h
  236. 2  drivers/net/wireless/b43legacy/dma.h
  237. 2  drivers/oprofile/oprofile_stats.h
  238. 2  drivers/pci/hotplug/cpci_hotplug_core.c
  239. 2  drivers/pci/xen-pcifront.c
  240. 2  drivers/s390/block/dasd_eer.c
  241. 2  drivers/s390/char/sclp_quiesce.c
  242. 2  drivers/s390/char/vmlogrdr.c
  243. 2  drivers/s390/cio/device.h
  244. 2  drivers/s390/cio/qdio_main.c
  245. 2  drivers/s390/cio/qdio_thinint.c
  246. 2  drivers/s390/crypto/ap_bus.c
  247. 2  drivers/s390/crypto/zcrypt_api.c
  248. 2  drivers/s390/crypto/zcrypt_cex2a.c
  249. 2  drivers/s390/crypto/zcrypt_mono.c
  250. 2  drivers/s390/crypto/zcrypt_pcica.c
  251. 2  drivers/s390/crypto/zcrypt_pcicc.c
  252. 2  drivers/s390/crypto/zcrypt_pcixcc.c
  253. 2  drivers/s390/net/fsm.h
  254. 2  drivers/s390/scsi/zfcp_scsi.c
  255. 2  drivers/sbus/char/display7seg.c
  256. 2  drivers/scsi/dpt/dpti_i2o.h
  257. 2  drivers/scsi/hpsa.c
  258. 2  drivers/scsi/pm8001/pm8001_sas.h
  259. 2  drivers/staging/octeon/ethernet-rx.c
  260. 2  drivers/staging/octeon/ethernet-tx.c
  261. 2  drivers/staging/solo6x10/solo6x10.h
  262. 2  drivers/staging/tidspbridge/include/dspbridge/host_os.h
  263. 2  drivers/staging/winbond/mds_s.h
  264. 2  drivers/staging/winbond/wb35reg_s.h
  265. 2  drivers/tty/bfin_jtag_comm.c
  266. 2  drivers/tty/rocket.c
  267. 2  drivers/tty/serial/dz.c
  268. 2  drivers/tty/serial/sb1250-duart.c
  269. 2  drivers/tty/serial/zs.c
  270. 2  drivers/usb/gadget/f_audio.c
  271. 2  drivers/usb/gadget/f_rndis.c
  272. 2  drivers/usb/gadget/uvc_queue.c
  273. 2  drivers/usb/image/microtek.c
  274. 2  drivers/usb/misc/appledisplay.c
  275. 2  drivers/usb/serial/garmin_gps.c
  276. 2  drivers/usb/wusbcore/wa-rpipe.c
  277. 2  drivers/vhost/vhost.h
  278. 2  drivers/video/sh_mobile_lcdcfb.c
  279. 2  drivers/video/vermilion/vermilion.h
  280. 2  drivers/w1/masters/matrox_w1.c
  281. 2  drivers/w1/w1.c
  282. 2  drivers/w1/w1_family.h
  283. 2  drivers/watchdog/intel_scu_watchdog.c
  284. 2  drivers/watchdog/sbc7240_wdt.c
  285. 2  fs/btrfs/delayed-inode.h
  286. 2  fs/direct-io.c
  287. 2  fs/eventpoll.c
  288. 2  fs/file_table.c
  289. 2  fs/gfs2/main.c
  290. 2  fs/nfs/cache_lib.h
  291. 2  fs/nfs/direct.c
  292. 2  fs/notify/group.c
  293. 2  fs/notify/inode_mark.c
  294. 2  fs/notify/mark.c
  295. 2  fs/notify/notification.c
  296. 2  fs/notify/vfsmount_mark.c
  297. 2  fs/ntfs/inode.h
  298. 2  fs/posix_acl.c
  299. 2  fs/proc/meminfo.c
  300. 2  include/acpi/platform/aclinux.h
1  arch/alpha/include/asm/atomic.h
@@ -199,7 +199,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
199 199
 	return c != (u);
200 200
 }
201 201
 
202  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
203 202
 
204 203
 /**
205 204
  * atomic64_add_unless - add unless the number is a given value
2  arch/alpha/include/asm/local.h
@@ -2,7 +2,7 @@
2 2
 #define _ALPHA_LOCAL_H
3 3
 
4 4
 #include <linux/percpu.h>
5  
-#include <asm/atomic.h>
  5
+#include <linux/atomic.h>
6 6
 
7 7
 typedef struct
8 8
 {
2  arch/alpha/kernel/perf_event.c
@@ -17,7 +17,7 @@
17 17
 #include <linux/init.h>
18 18
 
19 19
 #include <asm/hwrpb.h>
20  
-#include <asm/atomic.h>
  20
+#include <linux/atomic.h>
21 21
 #include <asm/irq.h>
22 22
 #include <asm/irq_regs.h>
23 23
 #include <asm/pal.h>
2  arch/alpha/kernel/smp.c
@@ -31,7 +31,7 @@
31 31
 
32 32
 #include <asm/hwrpb.h>
33 33
 #include <asm/ptrace.h>
34  
-#include <asm/atomic.h>
  34
+#include <linux/atomic.h>
35 35
 
36 36
 #include <asm/io.h>
37 37
 #include <asm/irq.h>
2  arch/alpha/lib/dec_and_lock.c
@@ -6,7 +6,7 @@
6 6
  */
7 7
 
8 8
 #include <linux/spinlock.h>
9  
-#include <asm/atomic.h>
  9
+#include <linux/atomic.h>
10 10
 
11 11
   asm (".text					\n\
12 12
 	.global _atomic_dec_and_lock		\n\
1  arch/arm/include/asm/atomic.h
@@ -217,7 +217,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
217 217
 		c = old;
218 218
 	return c != u;
219 219
 }
220  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
221 220
 
222 221
 #define atomic_inc(v)		atomic_add(1, v)
223 222
 #define atomic_dec(v)		atomic_sub(1, v)
2  arch/arm/kernel/smp.c
@@ -27,7 +27,7 @@
27 27
 #include <linux/clockchips.h>
28 28
 #include <linux/completion.h>
29 29
 
30  
-#include <asm/atomic.h>
  30
+#include <linux/atomic.h>
31 31
 #include <asm/cacheflush.h>
32 32
 #include <asm/cpu.h>
33 33
 #include <asm/cputype.h>
2  arch/arm/kernel/traps.c
@@ -25,7 +25,7 @@
25 25
 #include <linux/init.h>
26 26
 #include <linux/sched.h>
27 27
 
28  
-#include <asm/atomic.h>
  28
+#include <linux/atomic.h>
29 29
 #include <asm/cacheflush.h>
30 30
 #include <asm/system.h>
31 31
 #include <asm/unistd.h>
2  arch/arm/mach-at91/pm.c
@@ -20,7 +20,7 @@
20 20
 #include <linux/io.h>
21 21
 
22 22
 #include <asm/irq.h>
23  
-#include <asm/atomic.h>
  23
+#include <linux/atomic.h>
24 24
 #include <asm/mach/time.h>
25 25
 #include <asm/mach/irq.h>
26 26
 
2  arch/arm/mach-bcmring/dma.c
@@ -34,7 +34,7 @@
34 34
 
35 35
 #include <linux/mm.h>
36 36
 #include <linux/pfn.h>
37  
-#include <asm/atomic.h>
  37
+#include <linux/atomic.h>
38 38
 #include <mach/dma.h>
39 39
 
40 40
 /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */
2  arch/arm/mach-cns3xxx/include/mach/pm.h
@@ -11,7 +11,7 @@
11 11
 #ifndef __CNS3XXX_PM_H
12 12
 #define __CNS3XXX_PM_H
13 13
 
14  
-#include <asm/atomic.h>
  14
+#include <linux/atomic.h>
15 15
 
16 16
 void cns3xxx_pwr_clk_en(unsigned int block);
17 17
 void cns3xxx_pwr_clk_dis(unsigned int block);
2  arch/arm/mach-cns3xxx/pm.c
@@ -10,7 +10,7 @@
10 10
 #include <linux/module.h>
11 11
 #include <linux/io.h>
12 12
 #include <linux/delay.h>
13  
-#include <asm/atomic.h>
  13
+#include <linux/atomic.h>
14 14
 #include <mach/system.h>
15 15
 #include <mach/cns3xxx.h>
16 16
 #include <mach/pm.h>
2  arch/arm/mach-omap1/pm.c
@@ -44,7 +44,7 @@
44 44
 #include <linux/io.h>
45 45
 
46 46
 #include <asm/irq.h>
47  
-#include <asm/atomic.h>
  47
+#include <linux/atomic.h>
48 48
 #include <asm/mach/time.h>
49 49
 #include <asm/mach/irq.h>
50 50
 
2  arch/arm/mach-s3c2440/clock.c
@@ -36,7 +36,7 @@
36 36
 #include <linux/io.h>
37 37
 
38 38
 #include <mach/hardware.h>
39  
-#include <asm/atomic.h>
  39
+#include <linux/atomic.h>
40 40
 #include <asm/irq.h>
41 41
 
42 42
 #include <mach/regs-clock.h>
2  arch/arm/mach-s3c2440/s3c2442.c
@@ -38,7 +38,7 @@
38 38
 #include <linux/io.h>
39 39
 
40 40
 #include <mach/hardware.h>
41  
-#include <asm/atomic.h>
  41
+#include <linux/atomic.h>
42 42
 #include <asm/irq.h>
43 43
 
44 44
 #include <mach/regs-clock.h>
2  arch/arm/mach-s3c2440/s3c244x-clock.c
@@ -35,7 +35,7 @@
35 35
 #include <linux/io.h>
36 36
 
37 37
 #include <mach/hardware.h>
38  
-#include <asm/atomic.h>
  38
+#include <linux/atomic.h>
39 39
 #include <asm/irq.h>
40 40
 
41 41
 #include <mach/regs-clock.h>
1  arch/avr32/include/asm/atomic.h
@@ -188,7 +188,6 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v)
188 188
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
189 189
 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
190 190
 
191  
-#define atomic_inc_not_zero(v)	atomic_add_unless(v, 1, 0)
192 191
 #define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
193 192
 
194 193
 #define smp_mb__before_atomic_dec()	barrier()
1  arch/blackfin/include/asm/atomic.h
@@ -97,7 +97,6 @@ static inline void atomic_set_mask(int mask, atomic_t *v)
97 97
 		c = old;					\
98 98
 	c != (u);						\
99 99
 })
100  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
101 100
 
102 101
 /*
103 102
  * atomic_inc_and_test - increment and test
2  arch/blackfin/include/asm/dma.h
@@ -10,7 +10,7 @@
10 10
 
11 11
 #include <linux/interrupt.h>
12 12
 #include <mach/dma.h>
13  
-#include <asm/atomic.h>
  13
+#include <linux/atomic.h>
14 14
 #include <asm/blackfin.h>
15 15
 #include <asm/page.h>
16 16
 #include <asm-generic/dma.h>
2  arch/blackfin/include/asm/ipipe.h
@@ -32,7 +32,7 @@
32 32
 #include <asm/ptrace.h>
33 33
 #include <asm/irq.h>
34 34
 #include <asm/bitops.h>
35  
-#include <asm/atomic.h>
  35
+#include <linux/atomic.h>
36 36
 #include <asm/traps.h>
37 37
 #include <asm/bitsperlong.h>
38 38
 
2  arch/blackfin/include/asm/spinlock.h
@@ -11,7 +11,7 @@
11 11
 # include <asm-generic/spinlock.h>
12 12
 #else
13 13
 
14  
-#include <asm/atomic.h>
  14
+#include <linux/atomic.h>
15 15
 
16 16
 asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr);
17 17
 asmlinkage void __raw_spin_lock_asm(volatile int *ptr);
2  arch/blackfin/kernel/ftrace.c
@@ -9,7 +9,7 @@
9 9
 #include <linux/kernel.h>
10 10
 #include <linux/sched.h>
11 11
 #include <linux/uaccess.h>
12  
-#include <asm/atomic.h>
  12
+#include <linux/atomic.h>
13 13
 #include <asm/cacheflush.h>
14 14
 
15 15
 #ifdef CONFIG_DYNAMIC_FTRACE
2  arch/blackfin/kernel/ipipe.c
@@ -32,7 +32,7 @@
32 32
 #include <linux/unistd.h>
33 33
 #include <linux/io.h>
34 34
 #include <asm/system.h>
35  
-#include <asm/atomic.h>
  35
+#include <linux/atomic.h>
36 36
 #include <asm/irq_handler.h>
37 37
 
38 38
 DEFINE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
2  arch/blackfin/kernel/nmi.c
@@ -18,7 +18,7 @@
18 18
 #include <linux/smp.h>
19 19
 #include <linux/timer.h>
20 20
 #include <asm/blackfin.h>
21  
-#include <asm/atomic.h>
  21
+#include <linux/atomic.h>
22 22
 #include <asm/cacheflush.h>
23 23
 #include <asm/bfin_watchdog.h>
24 24
 
2  arch/blackfin/mach-common/smp.c
@@ -23,7 +23,7 @@
23 23
 #include <linux/seq_file.h>
24 24
 #include <linux/irq.h>
25 25
 #include <linux/slab.h>
26  
-#include <asm/atomic.h>
  26
+#include <linux/atomic.h>
27 27
 #include <asm/cacheflush.h>
28 28
 #include <asm/irq_handler.h>
29 29
 #include <asm/mmu_context.h>
2  arch/cris/arch-v32/drivers/cryptocop.c
@@ -16,7 +16,7 @@
16 16
 
17 17
 #include <asm/uaccess.h>
18 18
 #include <asm/io.h>
19  
-#include <asm/atomic.h>
  19
+#include <linux/atomic.h>
20 20
 
21 21
 #include <linux/list.h>
22 22
 #include <linux/interrupt.h>
2  arch/cris/arch-v32/kernel/smp.c
@@ -7,7 +7,7 @@
7 7
 #include <asm/mmu_context.h>
8 8
 #include <hwregs/asm/mmu_defs_asm.h>
9 9
 #include <hwregs/supp_reg.h>
10  
-#include <asm/atomic.h>
  10
+#include <linux/atomic.h>
11 11
 
12 12
 #include <linux/err.h>
13 13
 #include <linux/init.h>
1  arch/cris/include/asm/atomic.h
@@ -150,7 +150,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
150 150
 	cris_atomic_restore(v, flags);
151 151
 	return ret != u;
152 152
 }
153  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
154 153
 
155 154
 /* Atomic operations are already serializing */
156 155
 #define smp_mb__before_atomic_dec()    barrier()
2  arch/cris/include/asm/bitops.h
@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <arch/bitops.h>
22 22
 #include <asm/system.h>
23  
-#include <asm/atomic.h>
  23
+#include <linux/atomic.h>
24 24
 #include <linux/compiler.h>
25 25
 
26 26
 /*
2  arch/cris/kernel/process.c
@@ -12,7 +12,7 @@
12 12
  * This file handles the architecture-dependent parts of process handling..
13 13
  */
14 14
 
15  
-#include <asm/atomic.h>
  15
+#include <linux/atomic.h>
16 16
 #include <asm/pgtable.h>
17 17
 #include <asm/uaccess.h>
18 18
 #include <asm/irq.h>
1  arch/frv/include/asm/atomic.h
@@ -256,7 +256,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
256 256
 	return c != (u);
257 257
 }
258 258
 
259  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
260 259
 
261 260
 #include <asm-generic/atomic-long.h>
262 261
 #endif /* _ASM_ATOMIC_H */
2  arch/frv/include/asm/hardirq.h
@@ -12,7 +12,7 @@
12 12
 #ifndef __ASM_HARDIRQ_H
13 13
 #define __ASM_HARDIRQ_H
14 14
 
15  
-#include <asm/atomic.h>
  15
+#include <linux/atomic.h>
16 16
 
17 17
 extern atomic_t irq_err_count;
18 18
 static inline void ack_bad_irq(int irq)
2  arch/frv/kernel/irq.c
@@ -25,7 +25,7 @@
25 25
 #include <linux/module.h>
26 26
 #include <linux/bitops.h>
27 27
 
28  
-#include <asm/atomic.h>
  28
+#include <linux/atomic.h>
29 29
 #include <asm/io.h>
30 30
 #include <asm/smp.h>
31 31
 #include <asm/system.h>
1  arch/h8300/include/asm/atomic.h
@@ -116,7 +116,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
116 116
 	local_irq_restore(flags);
117 117
 	return ret != u;
118 118
 }
119  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
120 119
 
121 120
 static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v)
122 121
 {
1  arch/ia64/include/asm/atomic.h
@@ -105,7 +105,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
105 105
 	return c != (u);
106 106
 }
107 107
 
108  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
109 108
 
110 109
 static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)
111 110
 {
2  arch/ia64/include/asm/processor.h
@@ -75,7 +75,7 @@
75 75
 #include <asm/percpu.h>
76 76
 #include <asm/rse.h>
77 77
 #include <asm/unwind.h>
78  
-#include <asm/atomic.h>
  78
+#include <linux/atomic.h>
79 79
 #ifdef CONFIG_NUMA
80 80
 #include <asm/nodedata.h>
81 81
 #endif
2  arch/ia64/include/asm/spinlock.h
@@ -13,7 +13,7 @@
13 13
 #include <linux/kernel.h>
14 14
 #include <linux/bitops.h>
15 15
 
16  
-#include <asm/atomic.h>
  16
+#include <linux/atomic.h>
17 17
 #include <asm/intrinsics.h>
18 18
 #include <asm/system.h>
19 19
 
2  arch/ia64/kernel/smp.c
@@ -32,7 +32,7 @@
32 32
 #include <linux/bitops.h>
33 33
 #include <linux/kexec.h>
34 34
 
35  
-#include <asm/atomic.h>
  35
+#include <linux/atomic.h>
36 36
 #include <asm/current.h>
37 37
 #include <asm/delay.h>
38 38
 #include <asm/machvec.h>
2  arch/ia64/kernel/smpboot.c
@@ -40,7 +40,7 @@
40 40
 #include <linux/percpu.h>
41 41
 #include <linux/bitops.h>
42 42
 
43  
-#include <asm/atomic.h>
  43
+#include <linux/atomic.h>
44 44
 #include <asm/cache.h>
45 45
 #include <asm/current.h>
46 46
 #include <asm/delay.h>
2  arch/ia64/kernel/uncached.c
@@ -25,7 +25,7 @@
25 25
 #include <asm/pal.h>
26 26
 #include <asm/system.h>
27 27
 #include <asm/pgtable.h>
28  
-#include <asm/atomic.h>
  28
+#include <linux/atomic.h>
29 29
 #include <asm/tlbflush.h>
30 30
 #include <asm/sn/arch.h>
31 31
 
1  arch/m32r/include/asm/atomic.h
@@ -262,7 +262,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
262 262
 	return c != (u);
263 263
 }
264 264
 
265  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
266 265
 
267 266
 static __inline__ void atomic_clear_mask(unsigned long  mask, atomic_t *addr)
268 267
 {
2  arch/m32r/include/asm/mmu_context.h
@@ -11,7 +11,7 @@
11 11
 
12 12
 #ifndef __ASSEMBLY__
13 13
 
14  
-#include <asm/atomic.h>
  14
+#include <linux/atomic.h>
15 15
 #include <asm/pgalloc.h>
16 16
 #include <asm/mmu.h>
17 17
 #include <asm/tlbflush.h>
2  arch/m32r/include/asm/spinlock.h
@@ -10,7 +10,7 @@
10 10
  */
11 11
 
12 12
 #include <linux/compiler.h>
13  
-#include <asm/atomic.h>
  13
+#include <linux/atomic.h>
14 14
 #include <asm/page.h>
15 15
 
16 16
 /*
2  arch/m32r/kernel/smp.c
@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <asm/cacheflush.h>
28 28
 #include <asm/pgalloc.h>
29  
-#include <asm/atomic.h>
  29
+#include <linux/atomic.h>
30 30
 #include <asm/io.h>
31 31
 #include <asm/mmu_context.h>
32 32
 #include <asm/m32r.h>
2  arch/m32r/kernel/traps.c
@@ -21,7 +21,7 @@
21 21
 #include <asm/system.h>
22 22
 #include <asm/uaccess.h>
23 23
 #include <asm/io.h>
24  
-#include <asm/atomic.h>
  24
+#include <linux/atomic.h>
25 25
 
26 26
 #include <asm/smp.h>
27 27
 
1  arch/m68k/include/asm/atomic.h
@@ -198,7 +198,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
198 198
 	return c != (u);
199 199
 }
200 200
 
201  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
202 201
 
203 202
 /* Atomic operations are already serializing */
204 203
 #define smp_mb__before_atomic_dec()	barrier()
2  arch/microblaze/include/asm/mmu_context_mm.h
@@ -11,7 +11,7 @@
11 11
 #ifndef _ASM_MICROBLAZE_MMU_CONTEXT_H
12 12
 #define _ASM_MICROBLAZE_MMU_CONTEXT_H
13 13
 
14  
-#include <asm/atomic.h>
  14
+#include <linux/atomic.h>
15 15
 #include <asm/bitops.h>
16 16
 #include <asm/mmu.h>
17 17
 #include <asm-generic/mm_hooks.h>
2  arch/microblaze/include/asm/prom.h
@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <linux/types.h>
23 23
 #include <asm/irq.h>
24  
-#include <asm/atomic.h>
  24
+#include <linux/atomic.h>
25 25
 
26 26
 #define HAVE_ARCH_DEVTREE_FIXUPS
27 27
 
1  arch/mips/include/asm/atomic.h
@@ -325,7 +325,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
325 325
 	}
326 326
 	return c != (u);
327 327
 }
328  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
329 328
 
330 329
 #define atomic_dec_return(v) atomic_sub_return(1, (v))
331 330
 #define atomic_inc_return(v) atomic_add_return(1, (v))
2  arch/mips/include/asm/hw_irq.h
@@ -8,7 +8,7 @@
8 8
 #ifndef __ASM_HW_IRQ_H
9 9
 #define __ASM_HW_IRQ_H
10 10
 
11  
-#include <asm/atomic.h>
  11
+#include <linux/atomic.h>
12 12
 
13 13
 extern atomic_t irq_err_count;
14 14
 
2  arch/mips/include/asm/local.h
@@ -3,7 +3,7 @@
3 3
 
4 4
 #include <linux/percpu.h>
5 5
 #include <linux/bitops.h>
6  
-#include <asm/atomic.h>
  6
+#include <linux/atomic.h>
7 7
 #include <asm/cmpxchg.h>
8 8
 #include <asm/war.h>
9 9
 
2  arch/mips/include/asm/smp.h
@@ -17,7 +17,7 @@
17 17
 #include <linux/threads.h>
18 18
 #include <linux/cpumask.h>
19 19
 
20  
-#include <asm/atomic.h>
  20
+#include <linux/atomic.h>
21 21
 #include <asm/smp-ops.h>
22 22
 
23 23
 extern int smp_num_siblings;
2  arch/mips/kernel/irq.c
@@ -23,7 +23,7 @@
23 23
 #include <linux/kgdb.h>
24 24
 #include <linux/ftrace.h>
25 25
 
26  
-#include <asm/atomic.h>
  26
+#include <linux/atomic.h>
27 27
 #include <asm/system.h>
28 28
 #include <asm/uaccess.h>
29 29
 
2  arch/mips/kernel/mips-mt.c
@@ -12,7 +12,7 @@
12 12
 
13 13
 #include <asm/cpu.h>
14 14
 #include <asm/processor.h>
15  
-#include <asm/atomic.h>
  15
+#include <linux/atomic.h>
16 16
 #include <asm/system.h>
17 17
 #include <asm/hardirq.h>
18 18
 #include <asm/mmu_context.h>
2  arch/mips/kernel/rtlx.c
@@ -36,7 +36,7 @@
36 36
 #include <asm/mipsmtregs.h>
37 37
 #include <asm/mips_mt.h>
38 38
 #include <asm/cacheflush.h>
39  
-#include <asm/atomic.h>
  39
+#include <linux/atomic.h>
40 40
 #include <asm/cpu.h>
41 41
 #include <asm/processor.h>
42 42
 #include <asm/system.h>
2  arch/mips/kernel/smp-cmp.c
@@ -25,7 +25,7 @@
25 25
 #include <linux/interrupt.h>
26 26
 #include <linux/compiler.h>
27 27
 
28  
-#include <asm/atomic.h>
  28
+#include <linux/atomic.h>
29 29
 #include <asm/cacheflush.h>
30 30
 #include <asm/cpu.h>
31 31
 #include <asm/processor.h>
2  arch/mips/kernel/smp-mt.c
@@ -24,7 +24,7 @@
24 24
 #include <linux/compiler.h>
25 25
 #include <linux/smp.h>
26 26
 
27  
-#include <asm/atomic.h>
  27
+#include <linux/atomic.h>
28 28
 #include <asm/cacheflush.h>
29 29
 #include <asm/cpu.h>
30 30
 #include <asm/processor.h>
2  arch/mips/kernel/smp.c
@@ -34,7 +34,7 @@
34 34
 #include <linux/err.h>
35 35
 #include <linux/ftrace.h>
36 36
 
37  
-#include <asm/atomic.h>
  37
+#include <linux/atomic.h>
38 38
 #include <asm/cpu.h>
39 39
 #include <asm/processor.h>
40 40
 #include <asm/r4k-timer.h>
2  arch/mips/kernel/smtc-proc.c
@@ -10,7 +10,7 @@
10 10
 
11 11
 #include <asm/cpu.h>
12 12
 #include <asm/processor.h>
13  
-#include <asm/atomic.h>
  13
+#include <linux/atomic.h>
14 14
 #include <asm/system.h>
15 15
 #include <asm/hardirq.h>
16 16
 #include <asm/mmu_context.h>
2  arch/mips/kernel/smtc.c
@@ -30,7 +30,7 @@
30 30
 
31 31
 #include <asm/cpu.h>
32 32
 #include <asm/processor.h>
33  
-#include <asm/atomic.h>
  33
+#include <linux/atomic.h>
34 34
 #include <asm/system.h>
35 35
 #include <asm/hardirq.h>
36 36
 #include <asm/hazards.h>
2  arch/mips/kernel/sync-r4k.c
@@ -16,7 +16,7 @@
16 16
 #include <linux/cpumask.h>
17 17
 
18 18
 #include <asm/r4k-timer.h>
19  
-#include <asm/atomic.h>
  19
+#include <linux/atomic.h>
20 20
 #include <asm/barrier.h>
21 21
 #include <asm/mipsregs.h>
22 22
 
2  arch/mips/kernel/vpe.c
@@ -46,7 +46,7 @@
46 46
 #include <asm/mipsregs.h>
47 47
 #include <asm/mipsmtregs.h>
48 48
 #include <asm/cacheflush.h>
49  
-#include <asm/atomic.h>
  49
+#include <linux/atomic.h>
50 50
 #include <asm/cpu.h>
51 51
 #include <asm/mips_mt.h>
52 52
 #include <asm/processor.h>
2  arch/mips/mipssim/sim_smtc.c
@@ -24,7 +24,7 @@
24 24
 #include <linux/interrupt.h>
25 25
 #include <linux/smp.h>
26 26
 
27  
-#include <asm/atomic.h>
  27
+#include <linux/atomic.h>
28 28
 #include <asm/cpu.h>
29 29
 #include <asm/processor.h>
30 30
 #include <asm/smtc.h>
2  arch/mips/sgi-ip27/ip27-nmi.c
@@ -3,7 +3,7 @@
3 3
 #include <linux/nodemask.h>
4 4
 #include <linux/spinlock.h>
5 5
 #include <linux/smp.h>
6  
-#include <asm/atomic.h>
  6
+#include <linux/atomic.h>
7 7
 #include <asm/sn/types.h>
8 8
 #include <asm/sn/addrs.h>
9 9
 #include <asm/sn/nmi.h>
1  arch/mn10300/include/asm/atomic.h
@@ -269,7 +269,6 @@ static inline void atomic_dec(atomic_t *v)
269 269
 	c != (u);						\
270 270
 })
271 271
 
272  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
273 272
 
274 273
 /**
275 274
  * atomic_clear_mask - Atomically clear bits in memory
2  arch/mn10300/include/asm/mmu_context.h
@@ -22,7 +22,7 @@
22 22
 #ifndef _ASM_MMU_CONTEXT_H
23 23
 #define _ASM_MMU_CONTEXT_H
24 24
 
25  
-#include <asm/atomic.h>
  25
+#include <linux/atomic.h>
26 26
 #include <asm/pgalloc.h>
27 27
 #include <asm/tlbflush.h>
28 28
 #include <asm-generic/mm_hooks.h>
2  arch/mn10300/include/asm/spinlock.h
@@ -11,7 +11,7 @@
11 11
 #ifndef _ASM_SPINLOCK_H
12 12
 #define _ASM_SPINLOCK_H
13 13
 
14  
-#include <asm/atomic.h>
  14
+#include <linux/atomic.h>
15 15
 #include <asm/rwlock.h>
16 16
 #include <asm/page.h>
17 17
 
2  arch/mn10300/include/asm/system.h
@@ -19,7 +19,7 @@
19 19
 
20 20
 #include <linux/kernel.h>
21 21
 #include <linux/irqflags.h>
22  
-#include <asm/atomic.h>
  22
+#include <linux/atomic.h>
23 23
 
24 24
 #if !defined(CONFIG_LAZY_SAVE_FPU)
25 25
 struct fpu_state_struct;
2  arch/mn10300/kernel/mn10300-watchdog.c
@@ -19,7 +19,7 @@
19 19
 #include <linux/nmi.h>
20 20
 #include <asm/processor.h>
21 21
 #include <asm/system.h>
22  
-#include <asm/atomic.h>
  22
+#include <linux/atomic.h>
23 23
 #include <asm/intctl-regs.h>
24 24
 #include <asm/rtc-regs.h>
25 25
 #include <asm/div64.h>
2  arch/mn10300/kernel/traps.c
@@ -30,7 +30,7 @@
30 30
 #include <asm/system.h>
31 31
 #include <linux/uaccess.h>
32 32
 #include <asm/io.h>
33  
-#include <asm/atomic.h>
  33
+#include <linux/atomic.h>
34 34
 #include <asm/smp.h>
35 35
 #include <asm/pgalloc.h>
36 36
 #include <asm/cacheflush.h>
2  arch/mn10300/mm/misalignment.c
@@ -26,7 +26,7 @@
26 26
 #include <asm/system.h>
27 27
 #include <asm/uaccess.h>
28 28
 #include <asm/io.h>
29  
-#include <asm/atomic.h>
  29
+#include <linux/atomic.h>
30 30
 #include <asm/smp.h>
31 31
 #include <asm/pgalloc.h>
32 32
 #include <asm/cpu-regs.h>
2  arch/mn10300/proc-mn2ws0050/proc-init.c
@@ -18,7 +18,7 @@
18 18
 #include <asm/system.h>
19 19
 #include <asm/uaccess.h>
20 20
 #include <asm/io.h>
21  
-#include <asm/atomic.h>
  21
+#include <linux/atomic.h>
22 22
 #include <asm/smp.h>
23 23
 #include <asm/pgalloc.h>
24 24
 #include <asm/busctl-regs.h>
1  arch/parisc/include/asm/atomic.h
@@ -220,7 +220,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
220 220
 	return c != (u);
221 221
 }
222 222
 
223  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
224 223
 
225 224
 #define atomic_add(i,v)	((void)(__atomic_add_return( (i),(v))))
226 225
 #define atomic_sub(i,v)	((void)(__atomic_add_return(-(i),(v))))
2  arch/parisc/include/asm/bitops.h
@@ -8,7 +8,7 @@
8 8
 #include <linux/compiler.h>
9 9
 #include <asm/types.h>		/* for BITS_PER_LONG/SHIFT_PER_LONG */
10 10
 #include <asm/byteorder.h>
11  
-#include <asm/atomic.h>
  11
+#include <linux/atomic.h>
12 12
 
13 13
 /*
14 14
  * HP-PARISC specific bit operations
2  arch/parisc/include/asm/mmu_context.h
@@ -3,7 +3,7 @@
3 3
 
4 4
 #include <linux/mm.h>
5 5
 #include <linux/sched.h>
6  
-#include <asm/atomic.h>
  6
+#include <linux/atomic.h>
7 7
 #include <asm/pgalloc.h>
8 8
 #include <asm/pgtable.h>
9 9
 #include <asm-generic/mm_hooks.h>
2  arch/parisc/kernel/parisc_ksyms.c
@@ -31,7 +31,7 @@
31 31
 #include <linux/string.h>
32 32
 EXPORT_SYMBOL(memset);
33 33
 
34  
-#include <asm/atomic.h>
  34
+#include <linux/atomic.h>
35 35
 EXPORT_SYMBOL(__xchg8);
36 36
 EXPORT_SYMBOL(__xchg32);
37 37
 EXPORT_SYMBOL(__cmpxchg_u32);
2  arch/parisc/kernel/smp.c
@@ -33,7 +33,7 @@
33 33
 #include <linux/ftrace.h>
34 34
 
35 35
 #include <asm/system.h>
36  
-#include <asm/atomic.h>
  36
+#include <linux/atomic.h>
37 37
 #include <asm/current.h>
38 38
 #include <asm/delay.h>
39 39
 #include <asm/tlbflush.h>
2  arch/parisc/kernel/traps.c
@@ -33,7 +33,7 @@
33 33
 #include <asm/irq.h>
34 34
 #include <asm/traps.h>
35 35
 #include <asm/unaligned.h>
36  
-#include <asm/atomic.h>
  36
+#include <linux/atomic.h>
37 37
 #include <asm/smp.h>
38 38
 #include <asm/pdc.h>
39 39
 #include <asm/pdc_chassis.h>
2  arch/parisc/lib/bitops.c
@@ -9,7 +9,7 @@
9 9
 #include <linux/kernel.h>
10 10
 #include <linux/spinlock.h>
11 11
 #include <asm/system.h>
12  
-#include <asm/atomic.h>
  12
+#include <linux/atomic.h>
13 13
 
14 14
 #ifdef CONFIG_SMP
15 15
 arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
1  arch/powerpc/include/asm/atomic.h
@@ -212,7 +212,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
212 212
 	return t != u;
213 213
 }
214 214
 
215  
-#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
216 215
 
217 216
 #define atomic_sub_and_test(a, v)	(atomic_sub_return((a), (v)) == 0)
218 217
 #define atomic_dec_and_test(v)		(atomic_dec_return((v)) == 0)
2  arch/powerpc/include/asm/emulated_ops.h
@@ -18,7 +18,7 @@
18 18
 #ifndef _ASM_POWERPC_EMULATED_OPS_H
19 19
 #define _ASM_POWERPC_EMULATED_OPS_H
20 20
 
21  
-#include <asm/atomic.h>
  21
+#include <linux/atomic.h>
22 22
 #include <linux/perf_event.h>
23 23
 
24 24
 
2  arch/powerpc/include/asm/irq.h
@@ -14,7 +14,7 @@
14 14
 #include <linux/radix-tree.h>
15 15
 
16 16
 #include <asm/types.h>
17  
-#include <asm/atomic.h>
  17
+#include <linux/atomic.h>
18 18
 
19 19
 
20 20
 /* Define a way to iterate across irqs. */
2  arch/powerpc/include/asm/local.h
@@ -2,7 +2,7 @@
2 2
 #define _ARCH_POWERPC_LOCAL_H
3 3
 
4 4
 #include <linux/percpu.h>
5  
-#include <asm/atomic.h>
  5
+#include <linux/atomic.h>
6 6
 
7 7
 typedef struct
8 8
 {
2  arch/powerpc/include/asm/prom.h
@@ -18,7 +18,7 @@
18 18
  */
19 19
 #include <linux/types.h>
20 20
 #include <asm/irq.h>
21  
-#include <asm/atomic.h>
  21
+#include <linux/atomic.h>
22 22
 
23 23
 #define HAVE_ARCH_DEVTREE_FIXUPS
24 24
 
2  arch/powerpc/kernel/of_platform.c
@@ -26,7 +26,7 @@
26 26
 #include <asm/topology.h>
27 27
 #include <asm/pci-bridge.h>
28 28
 #include <asm/ppc-pci.h>
29  
-#include <asm/atomic.h>
  29
+#include <linux/atomic.h>
30 30
 
31 31
 #ifdef CONFIG_PPC_OF_PLATFORM_PCI
32 32
 
2  arch/powerpc/kernel/ppc_ksyms.c
@@ -18,7 +18,7 @@
18 18
 #include <asm/cacheflush.h>
19 19
 #include <asm/uaccess.h>
20 20
 #include <asm/io.h>
21  
-#include <asm/atomic.h>
  21
+#include <linux/atomic.h>
22 22
 #include <asm/checksum.h>
23 23
 #include <asm/pgtable.h>
24 24
 #include <asm/tlbflush.h>
2  arch/powerpc/kernel/rtas.c
@@ -39,7 +39,7 @@
39 39
 #include <asm/udbg.h>
40 40
 #include <asm/syscalls.h>
41 41
 #include <asm/smp.h>
42  
-#include <asm/atomic.h>
  42
+#include <linux/atomic.h>
43 43
 #include <asm/time.h>
44 44
 #include <asm/mmu.h>
45 45
 #include <asm/topology.h>
2  arch/powerpc/kernel/rtasd.c
@@ -27,7 +27,7 @@
27 27
 #include <asm/rtas.h>
28 28
 #include <asm/prom.h>
29 29
 #include <asm/nvram.h>
30  
-#include <asm/atomic.h>
  30
+#include <linux/atomic.h>
31 31
 #include <asm/machdep.h>
32 32
 
33 33
 
2  arch/powerpc/kernel/smp-tbsync.c
@@ -11,7 +11,7 @@
11 11
 #include <linux/unistd.h>
12 12
 #include <linux/init.h>
13 13
 #include <linux/slab.h>
14  
-#include <asm/atomic.h>
  14
+#include <linux/atomic.h>
15 15
 #include <asm/smp.h>
16 16
 #include <asm/time.h>
17 17
 
2  arch/powerpc/kernel/smp.c
@@ -33,7 +33,7 @@
33 33
 #include <linux/topology.h>
34 34
 
35 35
 #include <asm/ptrace.h>
36  
-#include <asm/atomic.h>
  36
+#include <linux/atomic.h>
37 37
 #include <asm/irq.h>
38 38
 #include <asm/page.h>
39 39
 #include <asm/pgtable.h>
2  arch/powerpc/platforms/83xx/km83xx.c
@@ -28,7 +28,7 @@
28 28
 #include <linux/of_device.h>