Merge tag 'pinctrl-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[firefly-linux-kernel-4.4.55.git] / drivers / net / hamradio / baycom_epp.c

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 83c7cce0d172b205f0b1d96405b6b66eea79ea55..72c9f1f352b4ec686a073b48f8df52d6245f771f 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -638,7 +638,7 @@ static int receive(struct net_device *dev, int cnt)
 #define GETTICK(x)                                                \
 ({                                                                \
        if (cpu_has_tsc)                                          \
-               rdtscl(x);                                        \
+               x = (unsigned int)rdtsc();                \
 })
 #else /* __i386__ */
 #define GETTICK(x)