From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751793AbaK2Wew (ORCPT ); Sat, 29 Nov 2014 17:34:52 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:56274 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751304AbaK2Weu (ORCPT ); Sat, 29 Nov 2014 17:34:50 -0500 From: "Rafael J. Wysocki" To: x86@kernel.org Cc: "H. Peter Anvin" , Linux Kernel Mailing List , Linux PM list , Thomas Gleixner , Ingo Molnar Subject: [PATCH] x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c Date: Sat, 29 Nov 2014 23:56:10 +0100 Message-ID: <5062650.1vTULtXiIc@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks depending on CONFIG_PM_RUNTIME may now be changed to depend on CONFIG_PM. Replace CONFIG_PM_RUNTIME with CONFIG_PM in x86/kernel/apic/io_apic.c. Signed-off-by: Rafael J. Wysocki --- This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) which currently is only in linux-next (via linux-pm). --- arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-pm/arch/x86/kernel/apic/io_apic.c =================================================================== --- linux-pm.orig/arch/x86/kernel/apic/io_apic.c +++ linux-pm/arch/x86/kernel/apic/io_apic.c @@ -3968,7 +3968,7 @@ bool mp_should_keep_irq(struct device *d { if (dev->power.is_prepared) return true; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM if (dev->power.runtime_status == RPM_SUSPENDING) return true; #endif