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>
This commit is contained in:
Arun Sharma 2011-07-26 16:09:06 -07:00 committed by Linus Torvalds
parent 148817ba09
commit 60063497a9
439 changed files with 427 additions and 448 deletions

View file

@ -199,7 +199,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/** /**
* atomic64_add_unless - add unless the number is a given value * atomic64_add_unless - add unless the number is a given value

View file

@ -2,7 +2,7 @@
#define _ALPHA_LOCAL_H #define _ALPHA_LOCAL_H
#include <linux/percpu.h> #include <linux/percpu.h>
#include <asm/atomic.h> #include <linux/atomic.h>
typedef struct typedef struct
{ {

View file

@ -17,7 +17,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <asm/hwrpb.h> #include <asm/hwrpb.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/irq_regs.h> #include <asm/irq_regs.h>
#include <asm/pal.h> #include <asm/pal.h>

View file

@ -31,7 +31,7 @@
#include <asm/hwrpb.h> #include <asm/hwrpb.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>

View file

@ -6,7 +6,7 @@
*/ */
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/atomic.h> #include <linux/atomic.h>
asm (".text \n\ asm (".text \n\
.global _atomic_dec_and_lock \n\ .global _atomic_dec_and_lock \n\

View file

@ -217,7 +217,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
c = old; c = old;
return c != u; return c != u;
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#define atomic_inc(v) atomic_add(1, v) #define atomic_inc(v) atomic_add(1, v)
#define atomic_dec(v) atomic_sub(1, v) #define atomic_dec(v) atomic_sub(1, v)

View file

@ -27,7 +27,7 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/cputype.h> #include <asm/cputype.h>

View file

@ -25,7 +25,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/unistd.h> #include <asm/unistd.h>

View file

@ -20,7 +20,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>

View file

@ -34,7 +34,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pfn.h> #include <linux/pfn.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <mach/dma.h> #include <mach/dma.h>
/* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */ /* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */

View file

@ -11,7 +11,7 @@
#ifndef __CNS3XXX_PM_H #ifndef __CNS3XXX_PM_H
#define __CNS3XXX_PM_H #define __CNS3XXX_PM_H
#include <asm/atomic.h> #include <linux/atomic.h>
void cns3xxx_pwr_clk_en(unsigned int block); void cns3xxx_pwr_clk_en(unsigned int block);
void cns3xxx_pwr_clk_dis(unsigned int block); void cns3xxx_pwr_clk_dis(unsigned int block);

View file

@ -10,7 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <mach/system.h> #include <mach/system.h>
#include <mach/cns3xxx.h> #include <mach/cns3xxx.h>
#include <mach/pm.h> #include <mach/pm.h>

View file

@ -44,7 +44,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>

View file

@ -36,7 +36,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>

View file

@ -38,7 +38,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>

View file

@ -35,7 +35,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/regs-clock.h> #include <mach/regs-clock.h>

View file

@ -188,7 +188,6 @@ static inline int atomic_sub_if_positive(int i, atomic_t *v)
#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0) #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
#define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0) #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
#define atomic_inc_not_zero(v) atomic_add_unless(v, 1, 0)
#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v) #define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
#define smp_mb__before_atomic_dec() barrier() #define smp_mb__before_atomic_dec() barrier()

View file

@ -97,7 +97,6 @@ static inline void atomic_set_mask(int mask, atomic_t *v)
c = old; \ c = old; \
c != (u); \ c != (u); \
}) })
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/* /*
* atomic_inc_and_test - increment and test * atomic_inc_and_test - increment and test

View file

@ -10,7 +10,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/dma.h> #include <asm-generic/dma.h>

View file

@ -32,7 +32,7 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/bitsperlong.h> #include <asm/bitsperlong.h>

View file

@ -11,7 +11,7 @@
# include <asm-generic/spinlock.h> # include <asm-generic/spinlock.h>
#else #else
#include <asm/atomic.h> #include <linux/atomic.h>
asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr); asmlinkage int __raw_spin_is_locked_asm(volatile int *ptr);
asmlinkage void __raw_spin_lock_asm(volatile int *ptr); asmlinkage void __raw_spin_lock_asm(volatile int *ptr);

View file

@ -9,7 +9,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE

View file

@ -32,7 +32,7 @@
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/irq_handler.h> #include <asm/irq_handler.h>
DEFINE_PER_CPU(struct pt_regs, __ipipe_tick_regs); DEFINE_PER_CPU(struct pt_regs, __ipipe_tick_regs);

View file

@ -18,7 +18,7 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/bfin_watchdog.h> #include <asm/bfin_watchdog.h>

View file

@ -23,7 +23,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/irq_handler.h> #include <asm/irq_handler.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>

View file

@ -16,7 +16,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>

View file

@ -7,7 +7,7 @@
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <hwregs/asm/mmu_defs_asm.h> #include <hwregs/asm/mmu_defs_asm.h>
#include <hwregs/supp_reg.h> #include <hwregs/supp_reg.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>

View file

@ -150,7 +150,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
cris_atomic_restore(v, flags); cris_atomic_restore(v, flags);
return ret != u; return ret != u;
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/* Atomic operations are already serializing */ /* Atomic operations are already serializing */
#define smp_mb__before_atomic_dec() barrier() #define smp_mb__before_atomic_dec() barrier()

View file

@ -20,7 +20,7 @@
#include <arch/bitops.h> #include <arch/bitops.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <linux/compiler.h> #include <linux/compiler.h>
/* /*

View file

@ -12,7 +12,7 @@
* This file handles the architecture-dependent parts of process handling.. * This file handles the architecture-dependent parts of process handling..
*/ */
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/irq.h> #include <asm/irq.h>

View file

@ -256,7 +256,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#include <asm-generic/atomic-long.h> #include <asm-generic/atomic-long.h>
#endif /* _ASM_ATOMIC_H */ #endif /* _ASM_ATOMIC_H */

View file

@ -12,7 +12,7 @@
#ifndef __ASM_HARDIRQ_H #ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H
#include <asm/atomic.h> #include <linux/atomic.h>
extern atomic_t irq_err_count; extern atomic_t irq_err_count;
static inline void ack_bad_irq(int irq) static inline void ack_bad_irq(int irq)

View file

@ -25,7 +25,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/system.h> #include <asm/system.h>

View file

@ -116,7 +116,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
local_irq_restore(flags); local_irq_restore(flags);
return ret != u; return ret != u;
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v) static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v)
{ {

View file

@ -105,7 +105,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u) static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)
{ {

View file

@ -75,7 +75,7 @@
#include <asm/percpu.h> #include <asm/percpu.h>
#include <asm/rse.h> #include <asm/rse.h>
#include <asm/unwind.h> #include <asm/unwind.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
#include <asm/nodedata.h> #include <asm/nodedata.h>
#endif #endif

View file

@ -13,7 +13,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/intrinsics.h> #include <asm/intrinsics.h>
#include <asm/system.h> #include <asm/system.h>

View file

@ -32,7 +32,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/kexec.h> #include <linux/kexec.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/machvec.h> #include <asm/machvec.h>

View file

@ -40,7 +40,7 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/delay.h> #include <asm/delay.h>

View file

@ -25,7 +25,7 @@
#include <asm/pal.h> #include <asm/pal.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/sn/arch.h> #include <asm/sn/arch.h>

View file

@ -262,7 +262,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr) static __inline__ void atomic_clear_mask(unsigned long mask, atomic_t *addr)
{ {

View file

@ -11,7 +11,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>

View file

@ -10,7 +10,7 @@
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/page.h> #include <asm/page.h>
/* /*

View file

@ -26,7 +26,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/m32r.h> #include <asm/m32r.h>

View file

@ -21,7 +21,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>

View file

@ -198,7 +198,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/* Atomic operations are already serializing */ /* Atomic operations are already serializing */
#define smp_mb__before_atomic_dec() barrier() #define smp_mb__before_atomic_dec() barrier()

View file

@ -11,7 +11,7 @@
#ifndef _ASM_MICROBLAZE_MMU_CONTEXT_H #ifndef _ASM_MICROBLAZE_MMU_CONTEXT_H
#define _ASM_MICROBLAZE_MMU_CONTEXT_H #define _ASM_MICROBLAZE_MMU_CONTEXT_H
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm-generic/mm_hooks.h> #include <asm-generic/mm_hooks.h>

View file

@ -21,7 +21,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#define HAVE_ARCH_DEVTREE_FIXUPS #define HAVE_ARCH_DEVTREE_FIXUPS

View file

@ -325,7 +325,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
} }
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#define atomic_dec_return(v) atomic_sub_return(1, (v)) #define atomic_dec_return(v) atomic_sub_return(1, (v))
#define atomic_inc_return(v) atomic_add_return(1, (v)) #define atomic_inc_return(v) atomic_add_return(1, (v))

View file

@ -8,7 +8,7 @@
#ifndef __ASM_HW_IRQ_H #ifndef __ASM_HW_IRQ_H
#define __ASM_HW_IRQ_H #define __ASM_HW_IRQ_H
#include <asm/atomic.h> #include <linux/atomic.h>
extern atomic_t irq_err_count; extern atomic_t irq_err_count;

View file

@ -3,7 +3,7 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cmpxchg.h> #include <asm/cmpxchg.h>
#include <asm/war.h> #include <asm/war.h>

View file

@ -17,7 +17,7 @@
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp-ops.h> #include <asm/smp-ops.h>
extern int smp_num_siblings; extern int smp_num_siblings;

View file

@ -23,7 +23,7 @@
#include <linux/kgdb.h> #include <linux/kgdb.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>

View file

@ -12,7 +12,7 @@
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>

View file

@ -36,7 +36,7 @@
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/mips_mt.h> #include <asm/mips_mt.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h> #include <asm/system.h>

View file

@ -25,7 +25,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>

View file

@ -24,7 +24,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>

View file

@ -34,7 +34,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/r4k-timer.h> #include <asm/r4k-timer.h>

View file

@ -10,7 +10,7 @@
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>

View file

@ -30,7 +30,7 @@
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/hazards.h> #include <asm/hazards.h>

View file

@ -16,7 +16,7 @@
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <asm/r4k-timer.h> #include <asm/r4k-timer.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/barrier.h> #include <asm/barrier.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>

View file

@ -46,7 +46,7 @@
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/mips_mt.h> #include <asm/mips_mt.h>
#include <asm/processor.h> #include <asm/processor.h>

View file

@ -24,7 +24,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/smtc.h> #include <asm/smtc.h>

View file

@ -3,7 +3,7 @@
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/sn/types.h> #include <asm/sn/types.h>
#include <asm/sn/addrs.h> #include <asm/sn/addrs.h>
#include <asm/sn/nmi.h> #include <asm/sn/nmi.h>

View file

@ -269,7 +269,6 @@ static inline void atomic_dec(atomic_t *v)
c != (u); \ c != (u); \
}) })
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/** /**
* atomic_clear_mask - Atomically clear bits in memory * atomic_clear_mask - Atomically clear bits in memory

View file

@ -22,7 +22,7 @@
#ifndef _ASM_MMU_CONTEXT_H #ifndef _ASM_MMU_CONTEXT_H
#define _ASM_MMU_CONTEXT_H #define _ASM_MMU_CONTEXT_H
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm-generic/mm_hooks.h> #include <asm-generic/mm_hooks.h>

View file

@ -11,7 +11,7 @@
#ifndef _ASM_SPINLOCK_H #ifndef _ASM_SPINLOCK_H
#define _ASM_SPINLOCK_H #define _ASM_SPINLOCK_H
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/rwlock.h> #include <asm/rwlock.h>
#include <asm/page.h> #include <asm/page.h>

View file

@ -19,7 +19,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#if !defined(CONFIG_LAZY_SAVE_FPU) #if !defined(CONFIG_LAZY_SAVE_FPU)
struct fpu_state_struct; struct fpu_state_struct;

View file

@ -19,7 +19,7 @@
#include <linux/nmi.h> #include <linux/nmi.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/rtc-regs.h> #include <asm/rtc-regs.h>
#include <asm/div64.h> #include <asm/div64.h>

View file

@ -30,7 +30,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>

View file

@ -26,7 +26,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>

View file

@ -18,7 +18,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/busctl-regs.h> #include <asm/busctl-regs.h>

View file

@ -220,7 +220,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return c != (u); return c != (u);
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#define atomic_add(i,v) ((void)(__atomic_add_return( (i),(v)))) #define atomic_add(i,v) ((void)(__atomic_add_return( (i),(v))))
#define atomic_sub(i,v) ((void)(__atomic_add_return(-(i),(v)))) #define atomic_sub(i,v) ((void)(__atomic_add_return(-(i),(v))))

View file

@ -8,7 +8,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/types.h> /* for BITS_PER_LONG/SHIFT_PER_LONG */ #include <asm/types.h> /* for BITS_PER_LONG/SHIFT_PER_LONG */
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/atomic.h> #include <linux/atomic.h>
/* /*
* HP-PARISC specific bit operations * HP-PARISC specific bit operations

View file

@ -3,7 +3,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm-generic/mm_hooks.h> #include <asm-generic/mm_hooks.h>

View file

@ -31,7 +31,7 @@
#include <linux/string.h> #include <linux/string.h>
EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memset);
#include <asm/atomic.h> #include <linux/atomic.h>
EXPORT_SYMBOL(__xchg8); EXPORT_SYMBOL(__xchg8);
EXPORT_SYMBOL(__xchg32); EXPORT_SYMBOL(__xchg32);
EXPORT_SYMBOL(__cmpxchg_u32); EXPORT_SYMBOL(__cmpxchg_u32);

View file

@ -33,7 +33,7 @@
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>

View file

@ -33,7 +33,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/pdc.h> #include <asm/pdc.h>
#include <asm/pdc_chassis.h> #include <asm/pdc_chassis.h>

View file

@ -9,7 +9,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = { arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {

View file

@ -212,7 +212,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
return t != u; return t != u;
} }
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#define atomic_sub_and_test(a, v) (atomic_sub_return((a), (v)) == 0) #define atomic_sub_and_test(a, v) (atomic_sub_return((a), (v)) == 0)
#define atomic_dec_and_test(v) (atomic_dec_return((v)) == 0) #define atomic_dec_and_test(v) (atomic_dec_return((v)) == 0)

View file

@ -18,7 +18,7 @@
#ifndef _ASM_POWERPC_EMULATED_OPS_H #ifndef _ASM_POWERPC_EMULATED_OPS_H
#define _ASM_POWERPC_EMULATED_OPS_H #define _ASM_POWERPC_EMULATED_OPS_H
#include <asm/atomic.h> #include <linux/atomic.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>

View file

@ -14,7 +14,7 @@
#include <linux/radix-tree.h> #include <linux/radix-tree.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/atomic.h> #include <linux/atomic.h>
/* Define a way to iterate across irqs. */ /* Define a way to iterate across irqs. */

View file

@ -2,7 +2,7 @@
#define _ARCH_POWERPC_LOCAL_H #define _ARCH_POWERPC_LOCAL_H
#include <linux/percpu.h> #include <linux/percpu.h>
#include <asm/atomic.h> #include <linux/atomic.h>
typedef struct typedef struct
{ {

View file

@ -18,7 +18,7 @@
*/ */
#include <linux/types.h> #include <linux/types.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#define HAVE_ARCH_DEVTREE_FIXUPS #define HAVE_ARCH_DEVTREE_FIXUPS

View file

@ -26,7 +26,7 @@
#include <asm/topology.h> #include <asm/topology.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#ifdef CONFIG_PPC_OF_PLATFORM_PCI #ifdef CONFIG_PPC_OF_PLATFORM_PCI

View file

@ -18,7 +18,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/checksum.h> #include <asm/checksum.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>

View file

@ -39,7 +39,7 @@
#include <asm/udbg.h> #include <asm/udbg.h>
#include <asm/syscalls.h> #include <asm/syscalls.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/topology.h> #include <asm/topology.h>

View file

@ -27,7 +27,7 @@
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/nvram.h> #include <asm/nvram.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -11,7 +11,7 @@
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/time.h> #include <asm/time.h>

View file

@ -33,7 +33,7 @@
#include <linux/topology.h> #include <linux/topology.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>

View file

@ -28,7 +28,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -27,7 +27,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -26,7 +26,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -26,7 +26,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -34,7 +34,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -28,7 +28,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -31,7 +31,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -36,7 +36,7 @@
#include <linux/memblock.h> #include <linux/memblock.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -34,7 +34,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machdep.h> #include <asm/machdep.h>

View file

@ -24,7 +24,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <asm/atomic.h> #include <linux/atomic.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/spu.h> #include <asm/spu.h>

Some files were not shown because too many files have changed in this diff Show more