diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:21:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-24 16:21:08 +0900 |
| commit | 540565257101f7c52b6fc5a57651f7505f8d20fe (patch) | |
| tree | 7adee0bc65a02fead0dd9cae4f2d4632b227ac56 /include/net/neighbour.h | |
| parent | 4d048435e9864998f6a6ad16422393d42322716d (diff) | |
| parent | 421b446abeec55bed1251fab80cb5c12be58b773 (diff) | |
| download | linux-540565257101f7c52b6fc5a57651f7505f8d20fe.tar.gz linux-540565257101f7c52b6fc5a57651f7505f8d20fe.tar.bz2 linux-540565257101f7c52b6fc5a57651f7505f8d20fe.zip | |
Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus
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; |