login
Header Space

 
 

[PATCH] x86: Change unnecessary dependencies on CONFIG_PM

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Ingo Molnar <mingo@...>
Cc: Andi Kleen <ak@...>, Adrian Bunk <bunk@...>, Pavel Machek <pavel@...>, <linux-kernel@...>
Date: Friday, January 11, 2008 - 7:06 pm

[Ingo, this patch applies on top of the mm branch, please add.]
---
From: Rafael J. Wysocki <rjw@sisk.pl>

CONFIG_PM_CPUINIT should depend on CONFIG_PM_SLEEP rather than
on CONFIG_PM, because it only is needed for suspend and
hibernation.  Also, it's not necessary to compile
arch/x86/power/cpu.c if CONFIG_PM_SLEEP is not set, for the same
reason.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 arch/x86/Kconfig        |    2 +-
 arch/x86/power/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -150,7 +150,7 @@ config GENERIC_PENDING_IRQ
 
 config PM_CPUINIT
 	bool
-	depends on PM
+	depends on PM_SLEEP
 	default y
 
 config X86_SMP
Index: linux-2.6/arch/x86/power/Makefile
===================================================================
--- linux-2.6.orig/arch/x86/power/Makefile
+++ linux-2.6/arch/x86/power/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_PM)		+= cpu.o
+obj-$(CONFIG_PM_SLEEP)		+= cpu.o
 obj-$(CONFIG_HIBERNATION)	+= swsusp.o suspend.o
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH x86] [0/16] Various i386/x86-64 changes, Andi Kleen, (Thu Jan 3, 11:42 am)
[PATCH x86] [16/16] Mark memory_setup __init, Andi Kleen, (Thu Jan 3, 11:42 am)
Re: [PATCH x86] [16/16] Mark memory_setup __init, Ingo Molnar, (Fri Jan 4, 5:25 am)
Re: [PATCH x86] [16/16] Mark memory_setup __init, Ingo Molnar, (Fri Jan 4, 5:53 am)
Re: [PATCH x86] [15/16] Force __cpuinit on for CONFIG_PM wit..., Rafael J. Wysocki, (Thu Jan 10, 1:14 pm)
Re: [PATCH x86] [15/16] Force __cpuinit on for CONFIG_PM wit..., Rafael J. Wysocki, (Thu Jan 10, 1:17 pm)
[PATCH] x86: Change unnecessary dependencies on CONFIG_PM, Rafael J. Wysocki, (Fri Jan 11, 7:06 pm)
[PATCH x86] [8/16] Make lockdep_init __init, Andi Kleen, (Thu Jan 3, 11:42 am)
Re: [PATCH x86] [8/16] Make lockdep_init __init, Ingo Molnar, (Fri Jan 4, 5:06 am)
speck-geostationary