From patchwork Mon Jan 27 06:08:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 23731 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 797DF203C4 for ; Mon, 27 Jan 2014 06:24:31 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oy12sf11655607veb.10 for ; Sun, 26 Jan 2014 22:24:30 -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=QYiawr3zA3wT6qeZMKLtaeuwPl1J+injhcpjkvjAN9v67jTYIYTKFGIMJXWU7Gv4i5 CJUpHMkiowSs6yxMmI4EU8KnOJNPzCr/S372jj9V4O6RHqRn4CQ3+TjPUVXHziqMr1yP LFBKmPHToi36tKP7to5RpNmDSmwYcnhV4pLvhedTSuNNoPH6ypvYm8yhIKoCNfSJ8lHX pUNWxPwVAVJikSr3W35zOBDI76hiFdn2E03VC/I/MHEZpwaj5jsO/hZrNyjWRGV62xp0 7bhhDg4I5xK4F717bRM26QOcsfzkgUJajznhi/OMnkCZbmnRcAvRCvKzwN12JN855+nd R6zw== X-Gm-Message-State: ALoCoQkCiDHWM0TpOsdwkjqP+XXFGkku92cXRbbG5aYkTm1o/NN7Ngx7OQ4AM3F6l0UwPed9HK18 X-Received: by 10.236.207.98 with SMTP id m62mr9620705yho.2.1390803870325; Sun, 26 Jan 2014 22:24:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.52 with SMTP id j49ls1523623qge.7.gmail; Sun, 26 Jan 2014 22:24:30 -0800 (PST) X-Received: by 10.58.80.103 with SMTP id q7mr103423vex.33.1390803870223; Sun, 26 Jan 2014 22:24:30 -0800 (PST) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id tj7si1219313vdc.33.2014.01.26.22.24.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 22:24:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.171 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.171; Received: by mail-ve0-f171.google.com with SMTP id pa12so3262959veb.16 for ; Sun, 26 Jan 2014 22:24:30 -0800 (PST) X-Received: by 10.58.181.71 with SMTP id du7mr342642vec.25.1390803870025; Sun, 26 Jan 2014 22:24:30 -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 u4csp107271vcz; Sun, 26 Jan 2014 22:24:29 -0800 (PST) X-Received: by 10.68.184.194 with SMTP id ew2mr28618576pbc.100.1390803868860; Sun, 26 Jan 2014 22:24:28 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vb2si7340103pbc.187.2014.01.26.22.24.28; Sun, 26 Jan 2014 22:24:28 -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 S1753543AbaA0GYV (ORCPT + 27 others); Mon, 27 Jan 2014 01:24:21 -0500 Received: from relais.videotron.ca ([24.201.245.36]:51663 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753470AbaA0GYR (ORCPT ); Mon, 27 Jan 2014 01:24:17 -0500 X-Greylist: delayed 901 seconds by postgrey-1.27 at vger.kernel.org; Mon, 27 Jan 2014 01:24:12 EST 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 <0N0100HJOQFBSKO0@VL-VM-MR006.ip.videotron.ca>; Mon, 27 Jan 2014 01:09:12 -0500 (EST) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id BF17D2DA03EB; Mon, 27 Jan 2014 01:09:11 -0500 (EST) From: Nicolas Pitre To: Russell King , Catalin Marinas , Benjamin Herrenschmidt , 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 9/9] cpu/idle.c: move to sched/idle.c Date: Mon, 27 Jan 2014 01:08:24 -0500 Message-id: <1390802904-28399-10-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 1.8.4.108.g55ea5f6 In-reply-to: <1390802904-28399-1-git-send-email-nicolas.pitre@linaro.org> References: <1390802904-28399-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.128.171 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