Message ID | 1391017513-12995-2-git-send-email-nicolas.pitre@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBCE6L2HOQQPRBXH4USLQKGQEGB64W5I@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A709C202FA for <linaro@patches.linaro.org>; Wed, 29 Jan 2014 17:46:05 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id y10sf4384345pdj.7 for <linaro@patches.linaro.org>; Wed, 29 Jan 2014 09:46:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe :content-transfer-encoding; bh=svtQzB0+d9C44f74VVb8ZMbPwWgyjMHRrcHMYoaz5Xk=; b=MIps+YYDygdVQ0wjUhJjxPsCxAAWBPTotIvRu7aPbK2g8JcVpoAYG1nDJWdXseuRAo EbLv8tE8fj8p+eu8pBqdMg+Ac9SFO4Rd2tm88aRRuwlPIuN7VCwlH4xuiwfEKMuUxszR J8kGUSwWbC59HEQP/9H9XPjiBsN8+wqYtmLe8WwHkrmy+9ZlP/xxep8g+1a+v0/T1Zjr YqNBHSUGWXzP69HYd39dWFd15eeX+CUYt/D3tYeHBlB/melSPfMlAG0UjWqQ23i2RN7t J9+GRQ1BSHyMHgyFTyTAZrDNtIOP58yJUpcIdaV1cVGWJZGJROg/tRHNtCWTm80mT8sk gnAw== X-Gm-Message-State: ALoCoQkAF+rzaEOywuZMKVv8SU38BpVat7Pz+rsw6sm+8FbUE6dMH/CFfTBG0VZtjm4e8X24iOhC X-Received: by 10.66.218.70 with SMTP id pe6mr3390065pac.33.1391017564942; Wed, 29 Jan 2014 09:46:04 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.51 with SMTP id o48ls210835qgd.83.gmail; Wed, 29 Jan 2014 09:46:04 -0800 (PST) X-Received: by 10.220.11.141 with SMTP id t13mr1541788vct.30.1391017564762; Wed, 29 Jan 2014 09:46:04 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id vd4si1020211vdc.26.2014.01.29.09.46.04 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 09:46:04 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oz11so1405755veb.18 for <patchwork-forward@linaro.org>; Wed, 29 Jan 2014 09:46:04 -0800 (PST) X-Received: by 10.220.159.4 with SMTP id h4mr7716759vcx.1.1391017564659; Wed, 29 Jan 2014 09:46:04 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp132633vcz; Wed, 29 Jan 2014 09:46:04 -0800 (PST) X-Received: by 10.68.114.163 with SMTP id jh3mr9170235pbb.99.1391017563705; Wed, 29 Jan 2014 09:46:03 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fv4si3383212pbd.332.2014.01.29.09.46.03; Wed, 29 Jan 2014 09:46:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752663AbaA2RpY (ORCPT <rfc822;linus.walleij@linaro.org> + 27 others); Wed, 29 Jan 2014 12:45:24 -0500 Received: from relais.videotron.ca ([24.201.245.36]:21485 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbaA2RpV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 29 Jan 2014 12:45:21 -0500 Received: from yoda.home ([66.130.143.177]) by VL-VM-MR006.ip.videotron.ca (Oracle Communications Messaging Exchange Server 7u4-22.01 64bit (built Apr 21 2011)) with ESMTP id <0N0600IR8BZJOTG0@VL-VM-MR006.ip.videotron.ca>; Wed, 29 Jan 2014 12:45:19 -0500 (EST) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 0ED182DA0534; Wed, 29 Jan 2014 12:45:19 -0500 (EST) From: Nicolas Pitre <nicolas.pitre@linaro.org> To: Russell King <linux@arm.linux.org.uk>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Preeti U Murthy <preeti@linux.vnet.ibm.com>, Paul Mundt <lethal@linux-sh.org>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Peter Zijlstra <peterz@infradead.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org Subject: [PATCH v2 1/6] idle: move the cpuidle entry point to the generic idle loop Date: Wed, 29 Jan 2014 12:45:08 -0500 Message-id: <1391017513-12995-2-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 1.8.4.108.g55ea5f6 In-reply-to: <1391017513-12995-1-git-send-email-nicolas.pitre@linaro.org> References: <1391017513-12995-1-git-send-email-nicolas.pitre@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nicolas.pitre@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> Content-transfer-encoding: 7BIT |
diff --git a/kernel/cpu/idle.c b/kernel/cpu/idle.c index 988573a9a3..ffcd3ee9af 100644 --- a/kernel/cpu/idle.c +++ b/kernel/cpu/idle.c @@ -3,6 +3,7 @@ */ #include <linux/sched.h> #include <linux/cpu.h> +#include <linux/cpuidle.h> #include <linux/tick.h> #include <linux/mm.h> #include <linux/stackprotector.h> @@ -95,7 +96,8 @@ static void cpu_idle_loop(void) if (!current_clr_polling_and_test()) { stop_critical_timings(); rcu_idle_enter(); - arch_cpu_idle(); + if (cpuidle_idle_call()) + arch_cpu_idle(); WARN_ON_ONCE(irqs_disabled()); rcu_idle_exit(); start_critical_timings();