git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compiler/gcc4: Add quirk for 'asm goto' miscompilation bug
[pandora-kernel.git]
/
arch
/
x86
/
oprofile
/
init.c
diff --git
a/arch/x86/oprofile/init.c
b/arch/x86/oprofile/init.c
index
5341d48
..
f148cf6
100644
(file)
--- a/
arch/x86/oprofile/init.c
+++ b/
arch/x86/oprofile/init.c
@@
-10,18
+10,20
@@
#include <linux/oprofile.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/oprofile.h>
#include <linux/init.h>
#include <linux/errno.h>
-
-/* We support CPUs that have performance counters like the Pentium Pro
+
+/*
+ * We support CPUs that have performance counters like the Pentium Pro
* with the NMI mode driver.
*/
* with the NMI mode driver.
*/
-
-extern int op_nmi_init(struct oprofile_operations *
ops);
-extern int op_nmi_timer_init(struct oprofile_operations *
ops);
+
+extern int op_nmi_init(struct oprofile_operations *ops);
+extern int op_nmi_timer_init(struct oprofile_operations *ops);
extern void op_nmi_exit(void);
extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
extern void op_nmi_exit(void);
extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
+static int nmi_timer;
-int __init oprofile_arch_init(struct oprofile_operations *
ops)
+int __init oprofile_arch_init(struct oprofile_operations *ops)
{
int ret;
{
int ret;
@@
-30,8
+32,9
@@
int __init oprofile_arch_init(struct oprofile_operations * ops)
#ifdef CONFIG_X86_LOCAL_APIC
ret = op_nmi_init(ops);
#endif
#ifdef CONFIG_X86_LOCAL_APIC
ret = op_nmi_init(ops);
#endif
+ nmi_timer = (ret != 0);
#ifdef CONFIG_X86_IO_APIC
#ifdef CONFIG_X86_IO_APIC
- if (
ret < 0
)
+ if (
nmi_timer
)
ret = op_nmi_timer_init(ops);
#endif
ops->backtrace = x86_backtrace;
ret = op_nmi_timer_init(ops);
#endif
ops->backtrace = x86_backtrace;
@@
-43,6
+46,7
@@
int __init oprofile_arch_init(struct oprofile_operations * ops)
void oprofile_arch_exit(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
void oprofile_arch_exit(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
- op_nmi_exit();
+ if (!nmi_timer)
+ op_nmi_exit();
#endif
}
#endif
}