diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2016-01-20 15:45:29 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2016-01-20 15:45:29 -0600 |
| commit | 1d10e9e61dedad92bcf380a421d08f021e62ff1b (patch) | |
| tree | 8e7641caa0710f4eba713a7f25de5eb314720993 /drivers/staging/lustre/include/linux/lnet/lib-lnet.h | |
| parent | d532db8c82faef41ad16e6db7a8459aa21f4a822 (diff) | |
| parent | 9f41e6b222c4a04c7b46068df82842a6188b4a57 (diff) | |
Merge tag 'lsk-v4.1-15.12' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1linux-lng-4.1.14-2016.03linux-lng-4.1.14-2016.02linux-lng-4.1.14-2016.01linux-linaro-lng-v4.1
LSK 15.12 v4.1
Diffstat (limited to 'drivers/staging/lustre/include/linux/lnet/lib-lnet.h')
| -rw-r--r-- | drivers/staging/lustre/include/linux/lnet/lib-lnet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h index 0038d29a37fe..a470e32c49c1 100644 --- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h +++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h @@ -874,7 +874,7 @@ void lnet_debug_peer(lnet_nid_t nid); static inline void lnet_peer_set_alive(lnet_peer_t *lp) { - lp->lp_last_alive = lp->lp_last_query = get_seconds(); + lp->lp_last_alive = lp->lp_last_query = jiffies; if (!lp->lp_alive) lnet_notify_locked(lp, 0, 1, lp->lp_last_alive); } |