mm, THP, swap: move anonymous THP split logic to vmscan

[karo-tx-linux.git] / include / net / ipv6.h

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 3e505bbff8ca4a41f8d39fefcd59aa01b85424f4..6eac5cf8f1e6e00510355a0f4eaa9566a5a0086f 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -16,6 +16,7 @@
 #include <linux/ipv6.h>
 #include <linux/hardirq.h>
 #include <linux/jhash.h>
+#include <linux/refcount.h>
 #include <net/if_inet6.h>
 #include <net/ndisc.h>
 #include <net/flow.h>
@@ -203,7 +204,7 @@ extern rwlock_t ip6_ra_lock;
  */
 
 struct ipv6_txoptions {
-       atomic_t                refcnt;
+       refcount_t              refcnt;
        /* Length of this structure */
        int                     tot_len;
 
@@ -265,7 +266,7 @@ static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)
        rcu_read_lock();
        opt = rcu_dereference(np->opt);
        if (opt) {
-               if (!atomic_inc_not_zero(&opt->refcnt))
+               if (!refcount_inc_not_zero(&opt->refcnt))
                        opt = NULL;
                else
                        opt = rcu_pointer_handoff(opt);
@@ -276,7 +277,7 @@ static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)
 
 static inline void txopt_put(struct ipv6_txoptions *opt)
 {
-       if (opt && atomic_dec_and_test(&opt->refcnt))
+       if (opt && refcount_dec_and_test(&opt->refcnt))
                kfree_rcu(opt, rcu);
 }