From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752561AbbHTTmr (ORCPT ); Thu, 20 Aug 2015 15:42:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41082 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbbHTTmp (ORCPT ); Thu, 20 Aug 2015 15:42:45 -0400 Date: Thu, 20 Aug 2015 12:42:31 -0700 From: tip-bot for Jisheng Zhang Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, len.brown@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jszhang@marvell.com Reply-To: tglx@linutronix.de, jszhang@marvell.com, linux-kernel@vger.kernel.org, mingo@kernel.org, len.brown@intel.com, hpa@zytor.com In-Reply-To: <1440046479-4262-1-git-send-email-jszhang@marvell.com> References: <1440046479-4262-1-git-send-email-jszhang@marvell.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/idle: Restore trace_cpu_idle to mwait_idle() calls Git-Commit-ID: e43d0189ac02415fe4487f79fc35e8f147e9ea0d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e43d0189ac02415fe4487f79fc35e8f147e9ea0d Gitweb: http://git.kernel.org/tip/e43d0189ac02415fe4487f79fc35e8f147e9ea0d Author: Jisheng Zhang AuthorDate: Thu, 20 Aug 2015 12:54:39 +0800 Committer: Thomas Gleixner CommitDate: Thu, 20 Aug 2015 21:37:45 +0200 x86/idle: Restore trace_cpu_idle to mwait_idle() calls Commit b253149b843f ("sched/idle/x86: Restore mwait_idle() to fix boot hangs, to improve power savings and to improve performance") restores mwait_idle(), but the trace_cpu_idle related calls are missing. This causes powertop on my old desktop powered by Intel Core2 E6550 to report zero wakeups and zero events. Add them back to restore the proper behaviour. Fixes: b253149b843f ("sched/idle/x86: Restore mwait_idle() to ...") Signed-off-by: Jisheng Zhang Cc: Cc: stable@vger.kernel.org # 4.1 Link: http://lkml.kernel.org/r/1440046479-4262-1-git-send-email-jszhang@marvell.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 397688b..c27cad7 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -408,6 +408,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c) static void mwait_idle(void) { if (!current_set_polling_and_test()) { + trace_cpu_idle_rcuidle(1, smp_processor_id()); if (this_cpu_has(X86_BUG_CLFLUSH_MONITOR)) { smp_mb(); /* quirk */ clflush((void *)¤t_thread_info()->flags); @@ -419,6 +420,7 @@ static void mwait_idle(void) __sti_mwait(0, 0); else local_irq_enable(); + trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id()); } else { local_irq_enable(); }