From 91e8b7077c1e06270a0f5fa5e7ab12fc1c7048ae Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 15 Nov 2010 19:58:26 +0000
Subject: [PATCH] --- yaml --- r: 224352 b: refs/heads/master c:
 c31504dc0d1dc853dcee509d9999169a9097a717 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 2 +-
 trunk/net/ipv4/udp.c     | 4 ++--
 trunk/net/ipv6/udp.c     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d1ff7b53b339..3e59db2b8413 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213b15ca818adf7766cd7162c2159a6ecdd3bab8
+refs/heads/master: c31504dc0d1dc853dcee509d9999169a9097a717
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index a6338d039857..eb0c1f504678 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -57,7 +57,7 @@
 #include <linux/rculist_nulls.h>
 #include <linux/poll.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <net/dst.h>
 #include <net/checksum.h>
 
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index 5e0a3a582a59..491ecd3f7a01 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -430,7 +430,7 @@ static struct sock *udp4_lib_lookup2(struct net *net,
 
 	if (result) {
 exact_match:
-		if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt)))
+		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
 			result = NULL;
 		else if (unlikely(compute_score2(result, net, saddr, sport,
 				  daddr, hnum, dif) < badness)) {
@@ -500,7 +500,7 @@ static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,
 		goto begin;
 
 	if (result) {
-		if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt)))
+		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
 			result = NULL;
 		else if (unlikely(compute_score(result, net, saddr, hnum, sport,
 				  daddr, dport, dif) < badness)) {
diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
index 91def93bec85..b541a4e009fb 100644
--- a/trunk/net/ipv6/udp.c
+++ b/trunk/net/ipv6/udp.c
@@ -227,7 +227,7 @@ static struct sock *udp6_lib_lookup2(struct net *net,
 
 	if (result) {
 exact_match:
-		if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt)))
+		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
 			result = NULL;
 		else if (unlikely(compute_score2(result, net, saddr, sport,
 				  daddr, hnum, dif) < badness)) {
@@ -294,7 +294,7 @@ static struct sock *__udp6_lib_lookup(struct net *net,
 		goto begin;
 
 	if (result) {
-		if (unlikely(!atomic_inc_not_zero(&result->sk_refcnt)))
+		if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2)))
 			result = NULL;
 		else if (unlikely(compute_score(result, net, hnum, saddr, sport,
 					daddr, dport, dif) < badness)) {