From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752819AbbDCNTM (ORCPT ); Fri, 3 Apr 2015 09:19:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47701 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752628AbbDCNTJ (ORCPT ); Fri, 3 Apr 2015 09:19:09 -0400 Date: Fri, 3 Apr 2015 06:18:58 -0700 From: "tip-bot for Rafael J. Wysocki" Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, rafael.j.wysocki@intel.com Reply-To: linux-kernel@vger.kernel.org, rafael.j.wysocki@intel.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1534128.H5hN3KBFB4@vostro.rjw.lan> References: <1534128.H5hN3KBFB4@vostro.rjw.lan> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers/PM: Drop unnecessary braces from tick_freeze() Git-Commit-ID: def747087e83aa5f6a71582cfa71e18341988688 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: def747087e83aa5f6a71582cfa71e18341988688 Gitweb: http://git.kernel.org/tip/def747087e83aa5f6a71582cfa71e18341988688 Author: Rafael J. Wysocki AuthorDate: Fri, 3 Apr 2015 15:31:32 +0200 Committer: Ingo Molnar CommitDate: Fri, 3 Apr 2015 15:15:52 +0200 timers/PM: Drop unnecessary braces from tick_freeze() Some braces in tick_freeze() are not necessary, so drop them. Signed-off-by: Rafael J. Wysocki Cc: peterz@infradead.org Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1534128.H5hN3KBFB4@vostro.rjw.lan Signed-off-by: Ingo Molnar --- kernel/time/tick-common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index ad66a51..3ae6afa 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -457,11 +457,10 @@ void tick_freeze(void) raw_spin_lock(&tick_freeze_lock); tick_freeze_depth++; - if (tick_freeze_depth == num_online_cpus()) { + if (tick_freeze_depth == num_online_cpus()) timekeeping_suspend(); - } else { + else tick_suspend_local(); - } raw_spin_unlock(&tick_freeze_lock); }