diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-16 15:32:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-16 15:36:41 +0100 |
| commit | 37a25424252b6cff4dd4b1937ab6a1dbfcadabcc (patch) | |
| tree | bb519b9461c508bf24afbd4b8cf2427a77128f9c /drivers | |
| parent | perfcounters: remove duplicate definition of LOCAL_PERF_VECTOR (diff) | |
| download | linux-37a25424252b6cff4dd4b1937ab6a1dbfcadabcc.tar.xz linux-37a25424252b6cff4dd4b1937ab6a1dbfcadabcc.zip | |
perfcounters: fix acpi_idle_do_entry() workaround
Fix merge error in drivers/acpi/processor_idle.c. This
resulted in non-working perfcounters on certain Nehalem
systems.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 259f6e806314..08def2f20cd9 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -826,12 +826,9 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx) { u64 perf_flags; - u64 pctrl; - /* Don't trace irqs off for idle */ stop_critical_timings(); perf_flags = hw_perf_save_disable(); - pctrl = hw_perf_save_disable(); if (cx->entry_method == ACPI_CSTATE_FFH) { /* Call into architectural FFH based C-state */ acpi_processor_ffh_cstate_enter(cx); @@ -847,7 +844,6 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx) unused = inl(acpi_gbl_FADT.xpm_timer_block.address); } hw_perf_restore(perf_flags); - hw_perf_restore(pctrl); start_critical_timings(); } |