diff options
author | Arun Sharma <asharma@fb.com> | 2011-07-26 19:09:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 19:49:47 -0400 |
commit | 60063497a95e716c9a689af3be2687d261f115b4 (patch) | |
tree | 6ce0d68db76982c53df46aee5f29f944ebf2c320 /net/l2tp | |
parent | 148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed (diff) |
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>
Diffstat (limited to 'net/l2tp')
-rw-r--r-- | net/l2tp/l2tp_core.c | 2 | ||||
-rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index ed8a2335442f..ad4ac2601a56 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c | |||
@@ -55,7 +55,7 @@ | |||
55 | #include <net/protocol.h> | 55 | #include <net/protocol.h> |
56 | 56 | ||
57 | #include <asm/byteorder.h> | 57 | #include <asm/byteorder.h> |
58 | #include <asm/atomic.h> | 58 | #include <linux/atomic.h> |
59 | 59 | ||
60 | #include "l2tp_core.h" | 60 | #include "l2tp_core.h" |
61 | 61 | ||
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 39a21d0c61c4..f42cd0915966 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
@@ -97,7 +97,7 @@ | |||
97 | #include <net/xfrm.h> | 97 | #include <net/xfrm.h> |
98 | 98 | ||
99 | #include <asm/byteorder.h> | 99 | #include <asm/byteorder.h> |
100 | #include <asm/atomic.h> | 100 | #include <linux/atomic.h> |
101 | 101 | ||
102 | #include "l2tp_core.h" | 102 | #include "l2tp_core.h" |
103 | 103 | ||