Browse Source

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>
master
Arun Sharma 11 years ago
committed by Linus Torvalds
parent
commit
60063497a9
  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

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

@ -199,7 +199,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int 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

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

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

2
arch/alpha/kernel/perf_event.c

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

2
arch/alpha/kernel/smp.c

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

2
arch/alpha/lib/dec_and_lock.c

@ -6,7 +6,7 @@
*/
#include <linux/spinlock.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
asm (".text \n\
.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)
c = old;
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_dec(v) atomic_sub(1, v)

2
arch/arm/kernel/smp.c

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

2
arch/arm/kernel/traps.c

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

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

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

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

@ -34,7 +34,7 @@
#include <linux/mm.h>
#include <linux/pfn.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <mach/dma.h>
/* 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 @@
#ifndef __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_dis(unsigned int block);

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

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

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

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

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

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

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

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

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

@ -35,7 +35,7 @@
#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <asm/irq.h>
#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)
#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_inc_not_zero(v) atomic_add_unless(v, 1, 0)
#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
#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)
c = old; \
c != (u); \
})
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/*
* atomic_inc_and_test - increment and test

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

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

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

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

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

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

2
arch/blackfin/kernel/ftrace.c

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

2
arch/blackfin/kernel/ipipe.c

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

2
arch/blackfin/kernel/nmi.c

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

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

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

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

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

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

@ -7,7 +7,7 @@
#include <asm/mmu_context.h>
#include <hwregs/asm/mmu_defs_asm.h>
#include <hwregs/supp_reg.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <linux/err.h>
#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)
cris_atomic_restore(v, flags);
return ret != u;
}
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
/* Atomic operations are already serializing */
#define smp_mb__before_atomic_dec() barrier()

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

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

2
arch/cris/kernel/process.c

@ -12,7 +12,7 @@
* This file handles the architecture-dependent parts of process handling..
*/
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
#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)
return c != (u);
}
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
#include <asm-generic/atomic-long.h>
#endif /* _ASM_ATOMIC_H */

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

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

2
arch/frv/kernel/irq.c

@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/bitops.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <asm/io.h>
#include <asm/smp.h>
#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)
local_irq_restore(flags);
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)
{

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

@ -105,7 +105,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int 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)
{

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

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

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

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

2
arch/ia64/kernel/smp.c

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

2
arch/ia64/kernel/smpboot.c

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

2
arch/ia64/kernel/uncached.c

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

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

@ -262,7 +262,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int 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)
{

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

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

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

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

2
arch/m32r/kernel/smp.c

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

2
arch/m32r/kernel/traps.c

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

1
arch/m68k/include/asm/atomic.h

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

2
arch/microblaze/include/asm/mmu_context_mm.h

@ -11,7 +11,7 @@
#ifndef _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/mmu.h>
#include <asm-generic/mm_hooks.h>

2
arch/microblaze/include/asm/prom.h

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

1
arch/mips/include/asm/atomic.h

@ -325,7 +325,6 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int 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_inc_return(v) atomic_add_return(1, (v))

2
arch/mips/include/asm/hw_irq.h

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

2
arch/mips/include/asm/local.h

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

2
arch/mips/include/asm/smp.h

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

2
arch/mips/kernel/irq.c

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

2
arch/mips/kernel/mips-mt.c

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

2
arch/mips/kernel/rtlx.c

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

2
arch/mips/kernel/smp-cmp.c

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

2
arch/mips/kernel/smp-mt.c

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

2
arch/mips/kernel/smp.c

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

2
arch/mips/kernel/smtc-proc.c

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

2
arch/mips/kernel/smtc.c

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

2
arch/mips/kernel/sync-r4k.c

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

2
arch/mips/kernel/vpe.c

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

2
arch/mips/mipssim/sim_smtc.c

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

2
arch/mips/sgi-ip27/ip27-nmi.c

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

1
arch/mn10300/include/asm/atomic.h

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

2
arch/mn10300/include/asm/mmu_context.h

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

2
arch/mn10300/include/asm/spinlock.h

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

2
arch/mn10300/include/asm/system.h

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

2
arch/mn10300/kernel/mn10300-watchdog.c

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

2
arch/mn10300/kernel/traps.c

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

2
arch/mn10300/mm/misalignment.c

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

2
arch/mn10300/proc-mn2ws0050/proc-init.c

@ -18,7 +18,7 @@
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#include <asm/smp.h>
#include <asm/pgalloc.h>
#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)
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_sub(i,v) ((void)(__atomic_add_return(-(i),(v))))

2
arch/parisc/include/asm/bitops.h

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

2
arch/parisc/include/asm/mmu_context.h

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

2
arch/parisc/kernel/parisc_ksyms.c

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

2
arch/parisc/kernel/smp.c

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

2
arch/parisc/kernel/traps.c

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

2
arch/parisc/lib/bitops.c

@ -9,7 +9,7 @@
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <asm/system.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
#ifdef CONFIG_SMP
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)
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_dec_and_test(v) (atomic_dec_return((v)) == 0)

2
arch/powerpc/include/asm/emulated_ops.h

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

2
arch/powerpc/include/asm/irq.h

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

2
arch/powerpc/include/asm/local.h

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

2
arch/powerpc/include/asm/prom.h

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

2
arch/powerpc/kernel/of_platform.c

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

2
arch/powerpc/kernel/ppc_ksyms.c

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

2
arch/powerpc/kernel/rtas.c

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

2
arch/powerpc/kernel/rtasd.c

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

2
arch/powerpc/kernel/smp-tbsync.c

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

2
arch/powerpc/kernel/smp.c

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

2
arch/powerpc/platforms/83xx/km83xx.c

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

2
arch/powerpc/platforms/83xx/mpc832x_mds.c

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

2
arch/powerpc/platforms/83xx/mpc834x_itx.c

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

2
arch/powerpc/platforms/83xx/mpc834x_mds.c

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

2
arch/powerpc/platforms/83xx/mpc836x_mds.c

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

2
arch/powerpc/platforms/83xx/sbc834x.c

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

2
arch/powerpc/platforms/85xx/mpc85xx_cds.c

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

2
arch/powerpc/platforms/85xx/mpc85xx_mds.c

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

2
arch/powerpc/platforms/85xx/sbc8548.c

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

2
arch/powerpc/platforms/cell/cpufreq_spudemand.c

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

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

Loading…
Cancel
Save