From patchwork Wed Jan 29 17:45:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 23893 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EDECD202FA for ; Wed, 29 Jan 2014 17:46:23 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id kp14sf4880252pab.2 for ; Wed, 29 Jan 2014 09:46:23 -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=xoLAmxLQ9B9XA6buiZ4Ebvb/vHaBUGJORd8naorKRoE=; b=S3r+mxFIzNV0KhUU7NrZbxvwgFQuFggMwAuUqbAQQ5mT9Wz02htXqrdRQxDfgQ+bJx 8f3ugg/h/K3MCTuVfIkGYU/R+Xut1hW4IMEXXNiqO8ML1iIE9RpmULdueQfUFeR71kio /Ss+VpfY1QfWrAAcYLqzYsiH5F65PzcwYF0zxpysBvq1aRrSXzEiVmwBEVZZoYISmqI+ 0ZwOr53cAJ1RxWlaKbMZX9vPCeyDtAsS+vXN0WmlGgjrv9C1Yf7yMaS+I8fAut6k9PBz ttuWdtGDikKoRka+T4WXOlSHg9fvrzGukbFlzGuWfDBAC+F8/XsuaxsLu+wcps9otgml hc9g== X-Gm-Message-State: ALoCoQljFKM943ITr6knywHWVfN3rsO129M+8+7WBZkVsdv94Umm5FuNnM49/El9EKKtDpiHa+h9 X-Received: by 10.66.150.106 with SMTP id uh10mr3312012pab.13.1391017583184; Wed, 29 Jan 2014 09:46:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.49 with SMTP id v46ls239671qge.6.gmail; Wed, 29 Jan 2014 09:46:22 -0800 (PST) X-Received: by 10.221.34.211 with SMTP id st19mr7633777vcb.5.1391017582917; Wed, 29 Jan 2014 09:46:22 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id si7si1004411vdc.141.2014.01.29.09.46.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 09:46:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id p14so1391332vbm.11 for ; Wed, 29 Jan 2014 09:46:22 -0800 (PST) X-Received: by 10.58.49.161 with SMTP id v1mr7478381ven.5.1391017582829; Wed, 29 Jan 2014 09:46:22 -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 u4csp132664vcz; Wed, 29 Jan 2014 09:46:22 -0800 (PST) X-Received: by 10.68.196.164 with SMTP id in4mr9388071pbc.128.1391017581719; Wed, 29 Jan 2014 09:46:21 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sd3si3444748pbb.42.2014.01.29.09.46.21; Wed, 29 Jan 2014 09:46:21 -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 S1752869AbaA2RqN (ORCPT + 27 others); Wed, 29 Jan 2014 12:46:13 -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 S1752402AbaA2RpX (ORCPT ); Wed, 29 Jan 2014 12:45:23 -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 <0N0600IREBZJOTG0@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 76A4D2DA047D; Wed, 29 Jan 2014 12:45:19 -0500 (EST) From: Nicolas Pitre To: Russell King , Benjamin Herrenschmidt , Preeti U Murthy , Paul Mundt , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , "Rafael J. Wysocki" , Daniel Lezcano 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 6/6] cpu/idle.c: move to sched/idle.c Date: Wed, 29 Jan 2014 12:45:13 -0500 Message-id: <1391017513-12995-7-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: 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.212.52 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: , List-Help: , List-Archive: List-Unsubscribe: , Content-transfer-encoding: 7BIT Integration of cpuidle with the scheduler requires that the idle loop be closely integrated with the scheduler proper. Moving cpu/idle.c into the sched directory will allow for a smoother integration, and eliminate a subdirectory which contained only one source file. Signed-off-by: Nicolas Pitre --- kernel/Makefile | 1 - kernel/cpu/Makefile | 1 - kernel/sched/Makefile | 2 +- kernel/{cpu => sched}/idle.c | 0 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 kernel/cpu/Makefile rename kernel/{cpu => sched}/idle.c (100%) diff --git a/kernel/cpu/idle.c b/kernel/sched/idle.c similarity index 100% rename from kernel/cpu/idle.c rename to kernel/sched/idle.c diff --git a/kernel/Makefile b/kernel/Makefile index bc010ee272..6f1c7e5cfc 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -22,7 +22,6 @@ obj-y += sched/ obj-y += locking/ obj-y += power/ obj-y += printk/ -obj-y += cpu/ obj-y += irq/ obj-y += rcu/ diff --git a/kernel/cpu/Makefile b/kernel/cpu/Makefile deleted file mode 100644 index 59ab052ef7..0000000000 --- a/kernel/cpu/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y = idle.o diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 7b621409cf..ac3e0ea68f 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -11,7 +11,7 @@ ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) CFLAGS_core.o := $(PROFILING) -fno-omit-frame-pointer endif -obj-y += core.o proc.o clock.o cputime.o idle_task.o fair.o rt.o stop_task.o +obj-y += core.o proc.o clock.o cputime.o idle_task.o idle.o fair.o rt.o stop_task.o obj-y += wait.o completion.o obj-$(CONFIG_SMP) += cpupri.o obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o