From 386a89ed83ad228fece688ed18119a0a3854319b Mon Sep 17 00:00:00 2001
From: Takeshi Shibagaki <shiba@FreeBSD.org>
Date: Sat, 31 Jan 2004 20:14:44 +0000
Subject: [PATCH] Compiled longrun.c when defined options CPU_ENABLE_LONGRUN,
 and fixed wrong comparation in cpu vendor. Longrun function was re-enabled.

---
 sys/conf/files.i386     | 1 +
 sys/i386/i386/longrun.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 41062bfe35ff..01d7b530d9d7 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -213,6 +213,7 @@ i386/i386/k6_mem.c		standard
 i386/i386/legacy.c		standard
 i386/i386/local_apic.c		optional	apic
 i386/i386/locore.s		standard	no-obj
+i386/i386/longrun.c		optional	cpu_enable_longrun
 i386/i386/machdep.c		standard
 i386/i386/mem.c			standard
 i386/i386/mp_clock.c		optional	smp
diff --git a/sys/i386/i386/longrun.c b/sys/i386/i386/longrun.c
index 9cc625b8f386..eacc38eddbc5 100644
--- a/sys/i386/i386/longrun.c
+++ b/sys/i386/i386/longrun.c
@@ -261,7 +261,7 @@ tmx86_longrun_profile_sysctl(SYSCTL_HANDLER_ARGS)
 static void
 setup_tmx86_longrun(void *dummy __unused)
 {
-	if (strcmp(cpu_vendor, "GenuineTMx86") != 0 ||
+	if (strcmp(cpu_vendor, "GenuineTMx86") != 0 &&
 	    strcmp(cpu_vendor, "TransmetaCPU") != 0)
 		return;