From patchwork Thu Nov 13 22:28:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 40789 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 11F6924493 for ; Thu, 13 Nov 2014 22:28:31 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf1192478wgg.3 for ; Thu, 13 Nov 2014 14:28: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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=K9bBxMUVEl9ZgFa3Tq0quthEYns4gZVu843ojKWVrPw=; b=cFC1QrJb6sHxrioBXQpoElZ0xj1+RBMMtiJmY6gd4kwoKsHCG6185ww4PQ4jybDt6S s5srmaWtR7ny1cAt4eouVwE1DKDy3ij/EFvQYKre6ck/fcKjHJXGBB1sIavzdXGrw2rM 7MEVuQ1PDXJgzIMKrKkNbqPo9Gu7hKfbCFKD8ISCjB9SadLYER1rC24Y7CFDVuGLu7Gu DV3RT00zET2GRHHWNmOAY7sxQegmMuvI25Nbqdue/75NbCJ7ZxSN49R5l1R6yUeUWTMP le0RFpzcRAteZWwcIuh6SRw2AqQfdra35LKwCdj6msiV574tQmvdUuvYCMFD0ZF17wiq pTkA== X-Gm-Message-State: ALoCoQnMeEhzQcC4VfdTGl7tyuub91P9azaHf4sBJO+cNVLObL3EdKXafejQUrZeP7xDmQwGJE50 X-Received: by 10.180.8.9 with SMTP id n9mr309717wia.6.1415917710377; Thu, 13 Nov 2014 14:28:30 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.130 with SMTP id m2ls466203laf.63.gmail; Thu, 13 Nov 2014 14:28:30 -0800 (PST) X-Received: by 10.152.5.6 with SMTP id o6mr4930825lao.8.1415917710249; Thu, 13 Nov 2014 14:28:30 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id xm7si39775693lbb.97.2014.11.13.14.28.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Nov 2014 14:28:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id n15so11741788lbi.20 for ; Thu, 13 Nov 2014 14:28:30 -0800 (PST) X-Received: by 10.112.172.97 with SMTP id bb1mr4819741lbc.38.1415917710169; Thu, 13 Nov 2014 14:28: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.112.184.201 with SMTP id ew9csp675089lbc; Thu, 13 Nov 2014 14:28:29 -0800 (PST) X-Received: by 10.70.35.49 with SMTP id e17mr5897330pdj.68.1415917708612; Thu, 13 Nov 2014 14:28:28 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gm10si5321807pbd.44.2014.11.13.14.28.27 for ; Thu, 13 Nov 2014 14:28:28 -0800 (PST) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934347AbaKMW20 (ORCPT + 12 others); Thu, 13 Nov 2014 17:28:26 -0500 Received: from mail.kernel.org ([198.145.19.201]:36711 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934190AbaKMW2Z (ORCPT ); Thu, 13 Nov 2014 17:28:25 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 05363201BB; Thu, 13 Nov 2014 22:28:24 +0000 (UTC) Received: from localhost (c-67-160-101-93.hsd1.wa.comcast.net [67.160.101.93]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A46E20149; Thu, 13 Nov 2014 22:28:23 +0000 (UTC) From: Kevin Hilman To: "Rafael J. Wysocki" Cc: Ulf Hansson , Geert Uytterhoeven , linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, Kevin Hilman , Tony Luck , Fenghua Yu , Pavel Machek , Len Brown , linux-ia64@vger.kernel.org (open list:IA64 (Itanium) PL...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] PM / Runtime: Kconfig: move ia64 dependency to arch/ia64/Kconfig Date: Thu, 13 Nov 2014 14:28:20 -0800 Message-Id: <1415917702-6742-1-git-send-email-khilman@kernel.org> X-Mailer: git-send-email 2.1.3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) 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: , From: Kevin Hilman The IA64_HP_SIM dependency on PM_RUNTIME should be done in the arch Kconfig instead of in the PM core. Move it accordingly. NOTE: arch/ia64/Kconfig currently does a 'select PM', which since commit 1eb208aea317 (PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)) is effectively a noop unless PM_SLEEP or PM_RUNTIME are set elsewhere. Signed-off-by: Kevin Hilman Reviewed-by: Ulf Hansson --- arch/ia64/Kconfig | 1 + kernel/power/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index c84c88bbbbd7..55bc92ca2ce6 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -233,6 +233,7 @@ config IA64_SGI_UV config IA64_HP_SIM bool "Ski-simulator" select SWIOTLB + depends on !PM_RUNTIME endchoice diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index bbef57f5bdfd..3d39cc0228e9 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -131,7 +131,6 @@ config PM_WAKELOCKS_GC config PM_RUNTIME bool "Run-time PM core functionality" - depends on !IA64_HP_SIM ---help--- Enable functionality allowing I/O devices to be put into energy-saving (low power) states at run time (or autosuspended) after a specified