[PATCH] Fix perfctr on x86_64

[Bryan O'Sullivan]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-29100-1055455045-0001-2
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

Mikael -

One of Andi's pre-2.5.70 x86_64 merges converted the x86_64 APIC code to
using the new driver model.  This patch against perfctr-2.5.4 fixes the
kernel portion of the perfctr build.

	<b

--=_courier-29100-1055455045-0001-2
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Content-Description: 
Content-Disposition: attachment; filename=perfctr-2.5.4.patch

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1441  -> 1.1442 
#	drivers/perfctr/x86_64.c	1.1     -> 1.2    
#	drivers/perfctr/x86_64_setup.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/12	[e-mail]	1.1442
# x86_64_setup.c, x86_64.c:
#   perfctr: Use new driver model for x86_64.
# --------------------------------------------
#
diff -Nru a/drivers/perfctr/x86_64.c b/drivers/perfctr/x86_64.c
--- a/drivers/perfctr/x86_64.c	Thu Jun 12 14:50:18 2003
+++ b/drivers/perfctr/x86_64.c	Thu Jun 12 14:50:18 2003
@@ -533,8 +533,8 @@
 	printk("perfctr: PM resume\n");
 }
 
-/* XXX: x86_64 hasn't converted apic & nmi to driver model yet */
-#if 0 && LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,67)
+/* x86_64 didn't convert apic & nmi to driver model until 2.5.70 */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
 
 #include <linux/device.h>
 
@@ -623,8 +623,8 @@
 
 #ifdef NMI_LOCAL_APIC
 
-/* XXX: x86_64 hasn't converted apic & nmi to driver model yet */
-#if 1 || LINUX_VERSION_CODE < KERNEL_VERSION(2,5,67)
+/* XXX: x86_64 didn't convert apic & nmi to driver model until 2.5.70 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70)
 static void __init disable_lapic_nmi_watchdog(void)
 {
 #ifdef CONFIG_PM
diff -Nru a/drivers/perfctr/x86_64_setup.c b/drivers/perfctr/x86_64_setup.c
--- a/drivers/perfctr/x86_64_setup.c	Thu Jun 12 14:50:18 2003
+++ b/drivers/perfctr/x86_64_setup.c	Thu Jun 12 14:50:18 2003
@@ -59,8 +59,8 @@
 #ifdef NMI_LOCAL_APIC
 EXPORT_SYMBOL(nmi_perfctr_msr);
 
-/* XXX: x86_64 hasn't converted apic & nmi to driver model yet */
-#if /*LINUX_VERSION_CODE < KERNEL_VERSION(2,5,67) &&*/ defined(CONFIG_PM)
+/* x86_64 didn't convert apic & nmi to driver model until 2.5.70 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,70) && defined(CONFIG_PM)
 EXPORT_SYMBOL(apic_pm_register);
 EXPORT_SYMBOL(apic_pm_unregister);
 EXPORT_SYMBOL(nmi_pmdev);

--=_courier-29100-1055455045-0001-2--