[linux-next] LinuxNextTracking branch, master, updated. next-20130115

batman at open-mesh.org batman at open-mesh.org
Wed Jan 16 00:20:27 CET 2013

The following commit has been merged in the master branch:
commit 569174433d3bd96e206a4b5969a4498371c70d16
Author: Shan Wei <davidshan at tencent.com>
Date:   Tue Nov 13 09:53:26 2012 +0800

    batman-adv: use per_cpu_add helper
    this_cpu_add is an atomic operation.
    and be more faster than per_cpu_ptr operation.
    Signed-off-by: Shan Wei <davidshan at tencent.com>
    Reviewed-by: Christoph Lameter <cl at linux.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 2f85577..c4fe41f 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -276,9 +276,7 @@ static inline bool batadv_has_timed_out(unsigned long timestamp,
 static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx,
 				      size_t count)
-	int cpu = get_cpu();
-	per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count;
-	put_cpu();
+	this_cpu_add(bat_priv->bat_counters[idx], count);
 #define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)


More information about the linux-merge mailing list