From: "Bryan O'Sullivan" <bos@serpentine.com>
To: mikpe@csd.uu.se
Cc: linux-kernel@vger.kernel.org, perfctr-devel@lists.sourceforge.net
Subject: [PATCH] Fix perfctr on x86_64
Date: 12 Jun 2003 14:54:03 -0700 [thread overview]
Message-ID: <1055454843.1043.21.camel@serpentine.internal.keyresearch.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
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
[-- Attachment #2: Type: text/plain, Size: 2143 bytes --]
# 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 bos@serpentine.com 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);
next reply other threads:[~2003-06-12 21:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-12 21:54 Bryan O'Sullivan [this message]
2003-06-12 22:05 ` mikpe
2003-06-12 22:21 ` Bryan O'Sullivan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1055454843.1043.21.camel@serpentine.internal.keyresearch.com \
--to=bos@serpentine.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mikpe@csd.uu.se \
--cc=perfctr-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®