aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2010-11-18 09:40:04 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-18 09:40:04 -0800
commitef22b7b65f0eda9015becc7bff225a399914a242 (patch)
tree15801292a4a57bc71552685e10f21e1e8094efc8 /include
parentb52b97a339c0f2d76dfd6a31466d3f1b05c5cf7e (diff)
net: Fix duplicate volatile warning.
jiffies is defined as "volatile". extern unsigned long volatile __jiffy_data jiffies; ACCESS_ONCE() uses "volatile". As a result, some compilers warn duplicate `volatile' for ACCESS_ONCE(jiffies). Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/neighbour.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 55590ab16b3..6beb1ffc2b7 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -303,7 +303,7 @@ static inline void neigh_confirm(struct neighbour *neigh)
static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
{
- unsigned long now = ACCESS_ONCE(jiffies);
+ unsigned long now = jiffies;
if (neigh->used != now)
neigh->used = now;