Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S316043AbSFUA12>; Thu, 20 Jun 2002 20:27:28 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S316047AbSFUA11>; Thu, 20 Jun 2002 20:27:27 -0400
Received: from e21.nc.us.ibm.com ([32.97.136.227]:28049 "EHLO
	e21.nc.us.ibm.com") by vger.kernel.org with ESMTP
	id <S316043AbSFUA10>; Thu, 20 Jun 2002 20:27:26 -0400
Subject: [TRIVIAL][PATCH] tsc-cleanup_A0
From: john stultz <johnstul@us.ibm.com>
To: marcelo <marcelo@conectiva.com.br>
Cc: lkml <linux-kernel@vger.kernel.org>
Content-Type: multipart/mixed; boundary="=-AOxQHMRTk7LqO1yf/RJL"
X-Mailer: Ximian Evolution 1.0.7 
Date: 20 Jun 2002 17:20:51 -0700
Message-Id: <1024618851.5184.186.camel@cog>
Mime-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2100
Lines: 63


--=-AOxQHMRTk7LqO1yf/RJL
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Marcelo
	Poking around w/ the tsc-disable patch, I figured I should send out
this trivial cleanup as well. I got these changes from a post Brian
Gerst originally released for 2.5.

thanks
-john



--=-AOxQHMRTk7LqO1yf/RJL
Content-Disposition: attachment; filename=linux-2.4.19-pre10_tsc-cleanup_A0.patch
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=linux-2.4.19-pre10_tsc-cleanup_A0.patch;
	charset=ISO-8859-1

diff -Nru a/drivers/char/joystick/analog.c b/drivers/char/joystick/analog.c
--- a/drivers/char/joystick/analog.c	Thu Jun 20 17:11:02 2002
+++ b/drivers/char/joystick/analog.c	Thu Jun 20 17:11:02 2002
@@ -137,10 +137,9 @@
  */
=20
 #ifdef __i386__
-#define TSC_PRESENT	(test_bit(X86_FEATURE_TSC, &boot_cpu_data.x86_capabili=
ty))
-#define GET_TIME(x)	do { if (TSC_PRESENT) rdtscl(x); else { outb(0, 0x43);=
 x =3D inb(0x40); x |=3D inb(0x40) << 8; } } while (0)
-#define DELTA(x,y)	(TSC_PRESENT?((y)-(x)):((x)-(y)+((x)<(y)?1193180L/HZ:0)=
))
-#define TIME_NAME	(TSC_PRESENT?"TSC":"PIT")
+#define GET_TIME(x)	do { if (cpu_has_tsc) rdtscl(x); else { outb(0, 0x43);=
 x =3D inb(0x40); x |=3D inb(0x40) << 8; } } while (0)
+#define DELTA(x,y)	(cpu_has_tsc?((y)-(x)):((x)-(y)+((x)<(y)?1193180L/HZ:0)=
))
+#define TIME_NAME	(cpu_has_tsc?"TSC":"PIT")
 #elif __x86_64__
 #define GET_TIME(x)	rdtscl(x)
 #define DELTA(x,y)	((y)-(x))
diff -Nru a/drivers/char/random.c b/drivers/char/random.c
--- a/drivers/char/random.c	Thu Jun 20 17:11:02 2002
+++ b/drivers/char/random.c	Thu Jun 20 17:11:02 2002
@@ -735,7 +735,7 @@
 	int		entropy =3D 0;
=20
 #if defined (__i386__)
-	if ( test_bit(X86_FEATURE_TSC, &boot_cpu_data.x86_capability) ) {
+	if (cpu_has_tsc) {
 		__u32 high;
 		rdtsc(time, high);
 		num ^=3D high;

--=-AOxQHMRTk7LqO1yf/RJL--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/