From mboxrd@z Thu Jan 1 00:00:00 1970 From: tip-bot for Andy Lutomirski Subject: [tip:x86/asm] x86/asm/tsc, drivers/net/hamradio/baycom_epp: Replace rdtscl() with native_read_tsc() Date: Mon, 6 Jul 2015 08:42:08 -0700 Message-ID: References: <1195ce0c7f34169ff3006341b77806184a46b9bf.1434501121.git.luto@kernel.org> Reply-To: peterz@infradead.org, dvlasenk@redhat.com, wharms@bfs.de, tglx@linutronix.de, ralf@linux-mips.org, bp@alien8.de, lenb@kernel.org, mingo@kernel.org, ray.huang@amd.com, john.stultz@linaro.org, kvm@vger.kernel.org, luto@amacapital.net, torvalds@linux-foundation.org, bp@suse.de, hpa@zytor.com, luto@kernel.org, brgerst@gmail.com, linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: lenb@kernel.org, tglx@linutronix.de, ralf@linux-mips.org, bp@alien8.de, mingo@kernel.org, ray.huang@amd.com, peterz@infradead.org, wharms@bfs.de, dvlasenk@redhat.com, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, luto@kernel.org, brgerst@gmail.com, john.stultz@linaro.org, luto@amacapital.net, torvalds@linux-foundation.org, kvm@vger.kernel.org To: linux-tip-commits@vger.kernel.org Return-path: In-Reply-To: <1195ce0c7f34169ff3006341b77806184a46b9bf.1434501121.git.luto@kernel.org> Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org Commit-ID: e18d1f8df176527332761ac29ee3097f8584c478 Gitweb: http://git.kernel.org/tip/e18d1f8df176527332761ac29ee3097f8584c478 Author: Andy Lutomirski AuthorDate: Thu, 25 Jun 2015 18:44:02 +0200 Committer: Ingo Molnar CommitDate: Mon, 6 Jul 2015 15:23:27 +0200 x86/asm/tsc, drivers/net/hamradio/baycom_epp: Replace rdtscl() with native_read_tsc() This is only used if BAYCOM_DEBUG is defined. Signed-off-by: Andy Lutomirski Signed-off-by: Borislav Petkov Acked-by: Thomas Sailer Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Huang Rui Cc: John Stultz Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ralf Baechle Cc: Thomas Gleixner Cc: kvm ML Cc: linux-hams@vger.kernel.org Link: http://lkml.kernel.org/r/1195ce0c7f34169ff3006341b77806184a46b9bf.1434501121.git.luto@kernel.org Signed-off-by: Ingo Molnar --- drivers/net/hamradio/baycom_epp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 83c7cce..44e5c3b 100644 --- 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)native_read_tsc(); \ }) #else /* __i386__ */ #define GETTICK(x)