The following commit has been merged in the next branch: commit e214bc74f02fb4b1d7694273d085ffc2686a7231 Author: Martin Hundebøll martin@hundeboll.net Date: Tue Apr 24 10:30:30 2012 +0200

batman-adv: Add cast to bat_counters in types.h

Signed-off-by: Martin Hundebøll martin@hundeboll.net

diff --git a/types.h b/types.h index 2944f77..41283e0 100644 --- a/types.h +++ b/types.h @@ -187,7 +187,7 @@ enum bat_counters { struct bat_priv { atomic_t mesh_state; struct net_device_stats stats; - uint64_t *bat_counters; /* Per cpu counters */ + uint64_t __percpu *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; /* boolean */ atomic_t bonding; /* boolean */ atomic_t fragmentation; /* boolean */