diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 06:50:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 06:50:21 +0100 |
| commit | 164777530b8853d92b52956312078190e2c5eeb1 (patch) | |
| tree | 88fa0de7577b106837f041d00dce12a1fa6d2ac6 /arch/x86/kernel/cpu | |
| parent | 09dc68d958c67c76cf672ec78b7391af453010f8 (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| download | linux-stable-164777530b8853d92b52956312078190e2c5eeb1.tar.gz linux-stable-164777530b8853d92b52956312078190e2c5eeb1.tar.bz2 linux-stable-164777530b8853d92b52956312078190e2c5eeb1.zip | |
Merge tag 'v3.12' into x86/cpu, to refresh the branch before queueing up more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 9d8449158cf9..8a87a3224121 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1276,16 +1276,16 @@ void perf_events_lapic_init(void) static int __kprobes perf_event_nmi_handler(unsigned int cmd, struct pt_regs *regs) { - int ret; u64 start_clock; u64 finish_clock; + int ret; if (!atomic_read(&active_events)) return NMI_DONE; - start_clock = local_clock(); + start_clock = sched_clock(); ret = x86_pmu.handle_irq(regs); - finish_clock = local_clock(); + finish_clock = sched_clock(); perf_sample_event_took(finish_clock - start_clock); |