From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753394AbbHVJBJ (ORCPT ); Sat, 22 Aug 2015 05:01:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33637 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753224AbbHVJBH (ORCPT ); Sat, 22 Aug 2015 05:01:07 -0400 Date: Sat, 22 Aug 2015 02:00:49 -0700 From: tip-bot for Guenter Roeck Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, lcapitulino@redhat.com, mingo@kernel.org, hpa@zytor.com, linux@roeck-us.net Reply-To: mingo@kernel.org, lcapitulino@redhat.com, hpa@zytor.com, linux@roeck-us.net, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <1440231047-16256-1-git-send-email-linux@roeck-us.net> References: <1440231047-16256-1-git-send-email-linux@roeck-us.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Handle failure of tick_init_highres() gracefully Git-Commit-ID: 85e1cd6e769dfc84995270d0a4838021fcb8602d 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: 85e1cd6e769dfc84995270d0a4838021fcb8602d Gitweb: http://git.kernel.org/tip/85e1cd6e769dfc84995270d0a4838021fcb8602d Author: Guenter Roeck AuthorDate: Sat, 22 Aug 2015 01:10:47 -0700 Committer: Thomas Gleixner CommitDate: Sat, 22 Aug 2015 10:57:50 +0200 hrtimer: Handle failure of tick_init_highres() gracefully Commit 75e3b37d0598 ("hrtimer: Drop return code of hrtimer_switch_to_hres()") drops the return code of hrtimer_switch_to_hres(). While doing so, it also drops the return statement itself on failure. This may cause a system hang. Seen when running arm:multi_v7_defconfig in qemu with devicetree file vexpress-v2p-ca9. Fixes: 75e3b37d0598 ("hrtimer: Drop return code of hrtimer_switch_to_hres()") Cc: Luiz Capitulino Signed-off-by: Guenter Roeck Link: http://lkml.kernel.org/r/1440231047-16256-1-git-send-email-linux@roeck-us.net Signed-off-by: Thomas Gleixner --- kernel/time/hrtimer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 5c4fe50..457a373 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -695,6 +695,7 @@ static void hrtimer_switch_to_hres(void) if (tick_init_highres()) { printk(KERN_WARNING "Could not switch to high resolution " "mode on CPU %d\n", base->cpu); + return; } base->hres_active = 1; hrtimer_resolution = HIGH_RES_NSEC;