Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60063497 authored by Arun Sharma's avatar Arun Sharma Committed by Linus Torvalds
Browse files

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: default avatarArun Sharma <asharma@fb.com>
Reviewed-by: default avatarEric 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: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 148817ba

arch/alpha/include/asm/atomic.h

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/alpha/include/asm/local.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define _ALPHA_LOCAL_H



#include <linux/percpu.h>

#include <asm/atomic.h>

#include <linux/atomic.h>



typedef struct

{

arch/alpha/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/alpha/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/alpha/lib/dec_and_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -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\