diff options
| author | Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> | 2010-11-18 18:40:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-18 18:40:04 +0100 |
| commit | ef22b7b65f0eda9015becc7bff225a399914a242 (patch) | |
| tree | 15801292a4a57bc71552685e10f21e1e8094efc8 /include/net/neighbour.h | |
| parent | MAINTAINERS: Add stmmac maintainer (diff) | |
| download | linux-ef22b7b65f0eda9015becc7bff225a399914a242.tar.xz linux-ef22b7b65f0eda9015becc7bff225a399914a242.zip | |
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/net/neighbour.h')
| -rw-r--r-- | include/net/neighbour.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 55590ab16b3e..6beb1ffc2b7f 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; |