From: Andrew Morton <akpm@digeo.com>
To: John Levon <levon@movementarian.org>
Cc: linux-kernel@vger.kernel.org, oprofile-list@lists.sourceforge.net
Subject: Re: [PATCH] OProfile Pentium IV support
Date: Wed, 08 Jan 2003 19:20:16 -0800 [thread overview]
Message-ID: <3E1CEA70.CE486C4D@digeo.com> (raw)
In-Reply-To: 20030109000035.GA53798@compsoc.man.ac.uk
John Levon wrote:
>
> This is a compile-tested-only port of Graydon Hoare's driver. Please
> give it a test and report back.
Below is a fix to make the kernel build when it is configured for
something other than a p4.
> http://www.movement.uklinux.net/oprofile-0.5cvs.tar.gz
$./configure
...
checking for ld... ld
checking for kernel OProfile support... no
checking for kernel version... 2.5.54
configure: error: Unsupported kernel version
arch/i386/oprofile/Makefile | 3 ++-
arch/i386/oprofile/nmi_int.c | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
--- linux-hype/arch/i386/oprofile/Makefile~op4-fix Wed Jan 8 19:12:38 2003
+++ linux-hype-akpm/arch/i386/oprofile/Makefile Wed Jan 8 19:12:38 2003
@@ -7,4 +7,5 @@ DRIVER_OBJS = $(addprefix ../../../drive
oprofile-y := $(DRIVER_OBJS) init.o timer_int.o
oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o \
- op_model_ppro.o op_model_p4.o
+ op_model_ppro.o
+oprofile-$(CONFIG_MPENTIUM4) += op_model_p4.o
--- linux-hype/arch/i386/oprofile/nmi_int.c~op4-fix Wed Jan 8 19:12:38 2003
+++ linux-hype-akpm/arch/i386/oprofile/nmi_int.c Wed Jan 8 19:12:38 2003
@@ -215,7 +215,7 @@ struct oprofile_operations nmi_ops = {
};
-#ifndef CONFIG_X86_64
+#if !defined(CONFIG_X86_64) && defined(CONFIG_MPENTIUM4)
static int __init p4_init(enum oprofile_cpu * cpu)
{
@@ -263,7 +263,7 @@ static int __init ppro_init(enum oprofil
return 1;
}
-#endif /* CONFIG_X86_64 */
+#endif
int __init nmi_init(struct oprofile_operations ** ops, enum oprofile_cpu * cpu)
{
@@ -282,7 +282,7 @@ int __init nmi_init(struct oprofile_oper
*cpu = OPROFILE_CPU_ATHLON;
break;
-#ifndef CONFIG_X86_64
+#if !defined(CONFIG_X86_64) && defined(CONFIG_MPENTIUM4)
case X86_VENDOR_INTEL:
switch (family) {
/* Pentium IV */
@@ -301,7 +301,7 @@ int __init nmi_init(struct oprofile_oper
return 0;
}
break;
-#endif /* CONFIG_X86_64 */
+#endif
default:
return 0;
_
next prev parent reply other threads:[~2003-01-09 3:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-09 0:00 [PATCH] OProfile Pentium IV support John Levon
2003-01-09 3:20 ` Andrew Morton [this message]
2003-01-09 3:25 ` John Levon
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=3E1CEA70.CE486C4D@digeo.com \
--to=akpm@digeo.com \
--cc=levon@movementarian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oprofile-list@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