From: Anton Blanchard <anton@samba•org>
To: benh@kernel•crashing.org, paulus@samba•org, mpe@ellerman•id.au,
rric@kernel•org, tglx@linutronix•de, mingo@redhat•com,
hpa@zytor•com
Cc: oprofile-list@lists•sf.net, x86@kernel•org,
linuxppc-dev@lists•ozlabs.org
Subject: [PATCH 1/2] oprofile: Add HAVE_OPROFILE_NMI_TIMER
Date: Wed, 21 Jan 2015 22:54:08 +1100 [thread overview]
Message-ID: <20150121225408.33194932@kryten> (raw)
In-Reply-To: <1421811983-22788-1-git-send-email-anton@samba.org>
HAVE_PERF_EVENTS_NMI is used for two things - the oprofile NMI timer
and the hard lockup detector.
Create HAVE_OPROFILE_NMI_TIMER so an architecture can select them
separately. On ppc64 we want to add the hard lockup detector, but not
the oprofile NMI timer fallback.
Signed-off-by: Anton Blanchard <anton@samba•org>
---
Resending, because I forgot to cc the x86 guys.
How would you like us to handle it? Michael Ellerman says
we can put it in a topic branch, or just merge it and cop
any conflicts.
diff --git a/arch/Kconfig b/arch/Kconfig
index 05d7a8a..3d50e42 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -30,9 +30,12 @@ config OPROFILE_EVENT_MULTIPLEX
config HAVE_OPROFILE
bool
+config HAVE_OPROFILE_NMI_TIMER
+ bool
+
config OPROFILE_NMI_TIMER
def_bool y
- depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+ depends on PERF_EVENTS && HAVE_OPROFILE_NMI_TIMER
config KPROBES
bool "Kprobes"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ba397bd..98d9c72 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -138,6 +138,7 @@ config X86
select HAVE_ACPI_APEI_NMI if ACPI
select ACPI_LEGACY_TABLES_LOOKUP if ACPI
select X86_FEATURE_NAMES if PROC_FS
+ select HAVE_OPROFILE_NMI_TIMER
config INSTRUCTION_DECODER
def_bool y
--
2.1.0
next prev parent reply other threads:[~2015-01-21 11:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-21 3:46 [PATCH 1/2] oprofile: Add HAVE_OPROFILE_NMI_TIMER Anton Blanchard
2015-01-21 3:46 ` [PATCH 2/2] powerpc: Add ppc64 hard lockup detector support Anton Blanchard
2015-01-21 11:54 ` Anton Blanchard [this message]
2015-01-21 18:20 ` [PATCH 1/2] oprofile: Add HAVE_OPROFILE_NMI_TIMER Robert Richter
2015-01-22 11:31 ` Anton Blanchard
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=20150121225408.33194932@kryten \
--to=anton@samba$(echo .)org \
--cc=benh@kernel$(echo .)crashing.org \
--cc=hpa@zytor$(echo .)com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mingo@redhat$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=oprofile-list@lists$(echo .)sf.net \
--cc=paulus@samba$(echo .)org \
--cc=rric@kernel$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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