Skip to content

Commit 6006349

Browse files
Arun Sharmatorvalds
Arun Sharma
authored and
torvalds
committed
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 <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: David Miller <[email protected]> Cc: Eric Dumazet <[email protected]> Acked-by: Mike Frysinger <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 148817b commit 6006349

File tree

439 files changed

+427
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

439 files changed

+427
-448
lines changed

‎arch/alpha/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
199199
return c != (u);
200200
}
201201

202-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
203202

204203
/**
205204
* atomic64_add_unless - add unless the number is a given value

‎arch/alpha/include/asm/local.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _ALPHA_LOCAL_H
33

44
#include <linux/percpu.h>
5-
#include <asm/atomic.h>
5+
#include <linux/atomic.h>
66

77
typedef struct
88
{

‎arch/alpha/kernel/perf_event.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/init.h>
1818

1919
#include <asm/hwrpb.h>
20-
#include <asm/atomic.h>
20+
#include <linux/atomic.h>
2121
#include <asm/irq.h>
2222
#include <asm/irq_regs.h>
2323
#include <asm/pal.h>

‎arch/alpha/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include <asm/hwrpb.h>
3333
#include <asm/ptrace.h>
34-
#include <asm/atomic.h>
34+
#include <linux/atomic.h>
3535

3636
#include <asm/io.h>
3737
#include <asm/irq.h>

‎arch/alpha/lib/dec_and_lock.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <linux/spinlock.h>
9-
#include <asm/atomic.h>
9+
#include <linux/atomic.h>
1010

1111
asm (".text \n\
1212
.global _atomic_dec_and_lock \n\

‎arch/arm/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
217217
c = old;
218218
return c != u;
219219
}
220-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
221220

222221
#define atomic_inc(v) atomic_add(1, v)
223222
#define atomic_dec(v) atomic_sub(1, v)

‎arch/arm/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <linux/clockchips.h>
2828
#include <linux/completion.h>
2929

30-
#include <asm/atomic.h>
30+
#include <linux/atomic.h>
3131
#include <asm/cacheflush.h>
3232
#include <asm/cpu.h>
3333
#include <asm/cputype.h>

‎arch/arm/kernel/traps.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/init.h>
2626
#include <linux/sched.h>
2727

28-
#include <asm/atomic.h>
28+
#include <linux/atomic.h>
2929
#include <asm/cacheflush.h>
3030
#include <asm/system.h>
3131
#include <asm/unistd.h>

‎arch/arm/mach-at91/pm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/io.h>
2121

2222
#include <asm/irq.h>
23-
#include <asm/atomic.h>
23+
#include <linux/atomic.h>
2424
#include <asm/mach/time.h>
2525
#include <asm/mach/irq.h>
2626

‎arch/arm/mach-bcmring/dma.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#include <linux/mm.h>
3636
#include <linux/pfn.h>
37-
#include <asm/atomic.h>
37+
#include <linux/atomic.h>
3838
#include <mach/dma.h>
3939

4040
/* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */

‎arch/arm/mach-cns3xxx/include/mach/pm.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef __CNS3XXX_PM_H
1212
#define __CNS3XXX_PM_H
1313

14-
#include <asm/atomic.h>
14+
#include <linux/atomic.h>
1515

1616
void cns3xxx_pwr_clk_en(unsigned int block);
1717
void cns3xxx_pwr_clk_dis(unsigned int block);

‎arch/arm/mach-cns3xxx/pm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/module.h>
1111
#include <linux/io.h>
1212
#include <linux/delay.h>
13-
#include <asm/atomic.h>
13+
#include <linux/atomic.h>
1414
#include <mach/system.h>
1515
#include <mach/cns3xxx.h>
1616
#include <mach/pm.h>

‎arch/arm/mach-omap1/pm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include <linux/io.h>
4545

4646
#include <asm/irq.h>
47-
#include <asm/atomic.h>
47+
#include <linux/atomic.h>
4848
#include <asm/mach/time.h>
4949
#include <asm/mach/irq.h>
5050

‎arch/arm/mach-s3c2440/clock.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <linux/io.h>
3737

3838
#include <mach/hardware.h>
39-
#include <asm/atomic.h>
39+
#include <linux/atomic.h>
4040
#include <asm/irq.h>
4141

4242
#include <mach/regs-clock.h>

‎arch/arm/mach-s3c2440/s3c2442.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <linux/io.h>
3939

4040
#include <mach/hardware.h>
41-
#include <asm/atomic.h>
41+
#include <linux/atomic.h>
4242
#include <asm/irq.h>
4343

4444
#include <mach/regs-clock.h>

‎arch/arm/mach-s3c2440/s3c244x-clock.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <linux/io.h>
3636

3737
#include <mach/hardware.h>
38-
#include <asm/atomic.h>
38+
#include <linux/atomic.h>
3939
#include <asm/irq.h>
4040

4141
#include <mach/regs-clock.h>

‎arch/avr32/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v)
188188
#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
189189
#define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
190190

191-
#define atomic_inc_not_zero(v) atomic_add_unless(v, 1, 0)
192191
#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
193192

194193
#define smp_mb__before_atomic_dec() barrier()

‎arch/blackfin/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ static inline void atomic_set_mask(int mask, atomic_t *v)
9797
c = old; \
9898
c != (u); \
9999
})
100-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
101100

102101
/*
103102
* atomic_inc_and_test - increment and test

‎arch/blackfin/include/asm/dma.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <linux/interrupt.h>
1212
#include <mach/dma.h>
13-
#include <asm/atomic.h>
13+
#include <linux/atomic.h>
1414
#include <asm/blackfin.h>
1515
#include <asm/page.h>
1616
#include <asm-generic/dma.h>

‎arch/blackfin/include/asm/ipipe.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <asm/ptrace.h>
3333
#include <asm/irq.h>
3434
#include <asm/bitops.h>
35-
#include <asm/atomic.h>
35+
#include <linux/atomic.h>
3636
#include <asm/traps.h>
3737
#include <asm/bitsperlong.h>
3838

‎arch/blackfin/include/asm/spinlock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# include <asm-generic/spinlock.h>
1212
#else
1313

14-
#include <asm/atomic.h>
14+
#include <linux/atomic.h>
1515

1616
asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr);
1717
asmlinkage void __raw_spin_lock_asm(volatile int *ptr);

‎arch/blackfin/kernel/ftrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/kernel.h>
1010
#include <linux/sched.h>
1111
#include <linux/uaccess.h>
12-
#include <asm/atomic.h>
12+
#include <linux/atomic.h>
1313
#include <asm/cacheflush.h>
1414

1515
#ifdef CONFIG_DYNAMIC_FTRACE

‎arch/blackfin/kernel/ipipe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <linux/unistd.h>
3333
#include <linux/io.h>
3434
#include <asm/system.h>
35-
#include <asm/atomic.h>
35+
#include <linux/atomic.h>
3636
#include <asm/irq_handler.h>
3737

3838
DEFINE_PER_CPU(struct pt_regs, __ipipe_tick_regs);

‎arch/blackfin/kernel/nmi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/smp.h>
1919
#include <linux/timer.h>
2020
#include <asm/blackfin.h>
21-
#include <asm/atomic.h>
21+
#include <linux/atomic.h>
2222
#include <asm/cacheflush.h>
2323
#include <asm/bfin_watchdog.h>
2424

‎arch/blackfin/mach-common/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <linux/seq_file.h>
2424
#include <linux/irq.h>
2525
#include <linux/slab.h>
26-
#include <asm/atomic.h>
26+
#include <linux/atomic.h>
2727
#include <asm/cacheflush.h>
2828
#include <asm/irq_handler.h>
2929
#include <asm/mmu_context.h>

‎arch/cris/arch-v32/drivers/cryptocop.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <asm/uaccess.h>
1818
#include <asm/io.h>
19-
#include <asm/atomic.h>
19+
#include <linux/atomic.h>
2020

2121
#include <linux/list.h>
2222
#include <linux/interrupt.h>

‎arch/cris/arch-v32/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <asm/mmu_context.h>
88
#include <hwregs/asm/mmu_defs_asm.h>
99
#include <hwregs/supp_reg.h>
10-
#include <asm/atomic.h>
10+
#include <linux/atomic.h>
1111

1212
#include <linux/err.h>
1313
#include <linux/init.h>

‎arch/cris/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
150150
cris_atomic_restore(v, flags);
151151
return ret != u;
152152
}
153-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
154153

155154
/* Atomic operations are already serializing */
156155
#define smp_mb__before_atomic_dec() barrier()

‎arch/cris/include/asm/bitops.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <arch/bitops.h>
2222
#include <asm/system.h>
23-
#include <asm/atomic.h>
23+
#include <linux/atomic.h>
2424
#include <linux/compiler.h>
2525

2626
/*

‎arch/cris/kernel/process.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* This file handles the architecture-dependent parts of process handling..
1313
*/
1414

15-
#include <asm/atomic.h>
15+
#include <linux/atomic.h>
1616
#include <asm/pgtable.h>
1717
#include <asm/uaccess.h>
1818
#include <asm/irq.h>

‎arch/frv/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
256256
return c != (u);
257257
}
258258

259-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
260259

261260
#include <asm-generic/atomic-long.h>
262261
#endif /* _ASM_ATOMIC_H */

‎arch/frv/include/asm/hardirq.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef __ASM_HARDIRQ_H
1313
#define __ASM_HARDIRQ_H
1414

15-
#include <asm/atomic.h>
15+
#include <linux/atomic.h>
1616

1717
extern atomic_t irq_err_count;
1818
static inline void ack_bad_irq(int irq)

‎arch/frv/kernel/irq.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/module.h>
2626
#include <linux/bitops.h>
2727

28-
#include <asm/atomic.h>
28+
#include <linux/atomic.h>
2929
#include <asm/io.h>
3030
#include <asm/smp.h>
3131
#include <asm/system.h>

‎arch/h8300/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
116116
local_irq_restore(flags);
117117
return ret != u;
118118
}
119-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
120119

121120
static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v)
122121
{

‎arch/ia64/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
105105
return c != (u);
106106
}
107107

108-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
109108

110109
static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)
111110
{

‎arch/ia64/include/asm/processor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
#include <asm/percpu.h>
7676
#include <asm/rse.h>
7777
#include <asm/unwind.h>
78-
#include <asm/atomic.h>
78+
#include <linux/atomic.h>
7979
#ifdef CONFIG_NUMA
8080
#include <asm/nodedata.h>
8181
#endif

‎arch/ia64/include/asm/spinlock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/kernel.h>
1414
#include <linux/bitops.h>
1515

16-
#include <asm/atomic.h>
16+
#include <linux/atomic.h>
1717
#include <asm/intrinsics.h>
1818
#include <asm/system.h>
1919

‎arch/ia64/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <linux/bitops.h>
3333
#include <linux/kexec.h>
3434

35-
#include <asm/atomic.h>
35+
#include <linux/atomic.h>
3636
#include <asm/current.h>
3737
#include <asm/delay.h>
3838
#include <asm/machvec.h>

‎arch/ia64/kernel/smpboot.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <linux/percpu.h>
4141
#include <linux/bitops.h>
4242

43-
#include <asm/atomic.h>
43+
#include <linux/atomic.h>
4444
#include <asm/cache.h>
4545
#include <asm/current.h>
4646
#include <asm/delay.h>

‎arch/ia64/kernel/uncached.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <asm/pal.h>
2626
#include <asm/system.h>
2727
#include <asm/pgtable.h>
28-
#include <asm/atomic.h>
28+
#include <linux/atomic.h>
2929
#include <asm/tlbflush.h>
3030
#include <asm/sn/arch.h>
3131

‎arch/m32r/include/asm/atomic.h

-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
262262
return c != (u);
263263
}
264264

265-
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
266265

267266
static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr)
268267
{

‎arch/m32r/include/asm/mmu_context.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#ifndef __ASSEMBLY__
1313

14-
#include <asm/atomic.h>
14+
#include <linux/atomic.h>
1515
#include <asm/pgalloc.h>
1616
#include <asm/mmu.h>
1717
#include <asm/tlbflush.h>

‎arch/m32r/include/asm/spinlock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
#include <linux/compiler.h>
13-
#include <asm/atomic.h>
13+
#include <linux/atomic.h>
1414
#include <asm/page.h>
1515

1616
/*

‎arch/m32r/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <asm/cacheflush.h>
2828
#include <asm/pgalloc.h>
29-
#include <asm/atomic.h>
29+
#include <linux/atomic.h>
3030
#include <asm/io.h>
3131
#include <asm/mmu_context.h>
3232
#include <asm/m32r.h>

‎arch/m32r/kernel/traps.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <asm/system.h>
2222
#include <asm/uaccess.h>
2323
#include <asm/io.h>
24-
#include <asm/atomic.h>
24+
#include <linux/atomic.h>
2525

2626
#include <asm/smp.h>
2727

0 commit comments

Comments
 (0)