projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
81213b5
)
net/netfilter/nfnetlink_acct.c: use linux/atomic.h
author
Andrew Morton
<
[email protected]
>
Wed, 28 Mar 2012 12:10:57 +0000
(12:10 +0000)
committer
David S. Miller
<
[email protected]
>
Sun, 1 Apr 2012 20:47:12 +0000
(16:47 -0400)
There's no known problem here, but this is one of only two non-arch files
in the kernel which use asm/atomic.h instead of linux/atomic.h.
Acked-by: Pablo Neira Ayuso <
[email protected]
>
Cc: Patrick McHardy <
[email protected]
>
Cc: "David S. Miller" <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/netfilter/nfnetlink_acct.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nfnetlink_acct.c
b/net/netfilter/nfnetlink_acct.c
index 3eb348bfc4fb11112d24d0c169c580f5e70b04e7..d98c868c148b6cff5f05f555a20547c76ca19f91 100644
(file)
--- a/
net/netfilter/nfnetlink_acct.c
+++ b/
net/netfilter/nfnetlink_acct.c
@@
-10,6
+10,7
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
+#include <linux/atomic.h>
#include <linux/netlink.h>
#include <linux/rculist.h>
#include <linux/slab.h>
@@
-17,7
+18,6
@@
#include <linux/errno.h>
#include <net/netlink.h>
#include <net/sock.h>
-#include <asm/atomic.h>
#include <linux/netfilter.h>
#include <linux/netfilter/nfnetlink.h>