summaryrefslogtreecommitdiffstats
path: root/arch/x86/oprofile/nmi_timer_int.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-12 14:37:42 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-01-12 14:37:42 +0900
commit83eb95b852902f952ba594447a796ad8146b9462 (patch)
tree33c199aeeae58b69ad8d6d2a33c2d96ba2b98ddf /arch/x86/oprofile/nmi_timer_int.c
parentefb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff)
parent9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff)
downloadtalos-op-linux-83eb95b852902f952ba594447a796ad8146b9462.tar.gz
talos-op-linux-83eb95b852902f952ba594447a796ad8146b9462.zip
Merge branch 'sh/sdio' into sh-latest
Diffstat (limited to 'arch/x86/oprofile/nmi_timer_int.c')
-rw-r--r--arch/x86/oprofile/nmi_timer_int.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/nmi_timer_int.c b/arch/x86/oprofile/nmi_timer_int.c
index 0636dd93cef8..720bf5a53c51 100644
--- a/arch/x86/oprofile/nmi_timer_int.c
+++ b/arch/x86/oprofile/nmi_timer_int.c
@@ -38,7 +38,7 @@ static int profile_timer_exceptions_notify(struct notifier_block *self,
static struct notifier_block profile_timer_exceptions_nb = {
.notifier_call = profile_timer_exceptions_notify,
.next = NULL,
- .priority = 0
+ .priority = NMI_LOW_PRIOR,
};
static int timer_start(void)
OpenPOWER on IntegriCloud