Re: [PATCH (2.6.25) 2/2] suspend: clean up Kconfig

2007-11-08 Thread Ralf Baechle 
On Wed, Nov 07, 2007 at 02:58:00PM +0100, Johannes Berg wrote:

 This cleans up the suspend Kconfig and removes the need to
 declare centrally which architectures support suspend. All
 architectures that currently support suspend are modified
 accordingly.

Acked-by: Ralf Baechle [EMAIL PROTECTED]

Cheers,

  Ralf
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH (2.6.25) 2/2] suspend: clean up Kconfig

2007-11-07 Thread Paul Mundt 
On Wed, Nov 07, 2007 at 02:58:00PM +0100, Johannes Berg wrote:
 This cleans up the suspend Kconfig and removes the need to
 declare centrally which architectures support suspend. All
 architectures that currently support suspend are modified
 accordingly.
 
 Signed-off-by: Johannes Berg [EMAIL PROTECTED]
 Cc: Rafael J. Wysocki [EMAIL PROTECTED]
 Cc: linuxppc-dev@ozlabs.org
 Cc: [EMAIL PROTECTED]
 Cc: Guennadi Liakhovetski [EMAIL PROTECTED]
 Cc: Scott Wood [EMAIL PROTECTED]
 Cc: David Howells [EMAIL PROTECTED]
 Cc: Ralf Baechle [EMAIL PROTECTED]
 Cc: [EMAIL PROTECTED]
 Cc: Paul Mundt [EMAIL PROTECTED]
 Cc: Bryan Wu [EMAIL PROTECTED]
 Cc: Russell King [EMAIL PROTECTED]
 ---
 Architecture maintainers should evaluate whether their
 ARCH_SUSPEND_POSSIBLE symbol should be set only under
 stricter circumstances like I've done for powerpc.
 
The SH bits look fine.

Acked-by: Paul Mundt [EMAIL PROTECTED]
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

[PATCH (2.6.25) 2/2] suspend: clean up Kconfig

2007-11-07 Thread Johannes Berg 
This cleans up the suspend Kconfig and removes the need to
declare centrally which architectures support suspend. All
architectures that currently support suspend are modified
accordingly.

Signed-off-by: Johannes Berg [EMAIL PROTECTED]
Cc: Rafael J. Wysocki [EMAIL PROTECTED]
Cc: linuxppc-dev@ozlabs.org
Cc: [EMAIL PROTECTED]
Cc: Guennadi Liakhovetski [EMAIL PROTECTED]
Cc: Scott Wood [EMAIL PROTECTED]
Cc: David Howells [EMAIL PROTECTED]
Cc: Ralf Baechle [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Cc: Paul Mundt [EMAIL PROTECTED]
Cc: Bryan Wu [EMAIL PROTECTED]
Cc: Russell King [EMAIL PROTECTED]
---
Architecture maintainers should evaluate whether their
ARCH_SUSPEND_POSSIBLE symbol should be set only under
stricter circumstances like I've done for powerpc.

Always setting it is not usually a problem, however, since the
infrastructure is only available for use after suspend_set_ops().

 arch/arm/Kconfig  |3 +++
 arch/blackfin/Kconfig |4 
 arch/frv/Kconfig  |5 +
 arch/i386/Kconfig |4 
 arch/mips/Kconfig |4 
 arch/powerpc/Kconfig  |4 
 arch/sh/Kconfig   |4 
 arch/x86_64/Kconfig   |3 +++
 kernel/power/Kconfig  |   21 +++--
 9 files changed, 34 insertions(+), 18 deletions(-)

--- everything.orig/arch/i386/Kconfig   2007-11-07 14:45:28.591544215 +0100
+++ everything/arch/i386/Kconfig2007-11-07 14:45:28.631515461 +0100
@@ -1323,3 +1323,7 @@ config KTIME_SCALAR
 config ARCH_HIBERNATION_POSSIBLE
def_bool y
depends on !SMP || !X86_VOYAGER
+
+config ARCH_SUSPEND_POSSIBLE
+   def_bool y
+   depends on !X86_VOYAGER
--- everything.orig/arch/x86_64/Kconfig 2007-11-07 14:45:28.591544215 +0100
+++ everything/arch/x86_64/Kconfig  2007-11-07 14:45:28.631515461 +0100
@@ -716,6 +716,9 @@ menu Power management options
 
 source kernel/power/Kconfig
 
+config ARCH_SUSPEND_POSSIBLE
+   def_bool y
+
 config ARCH_HIBERNATION_POSSIBLE
def_bool y
 
--- everything.orig/kernel/power/Kconfig2007-11-07 14:45:28.591544215 
+0100
+++ everything/kernel/power/Kconfig 2007-11-07 14:45:28.641531465 +0100
@@ -64,7 +64,7 @@ config PM_TRACE
 config PM_SLEEP_SMP
bool
depends on SMP
-   depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
+   depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP
select HOTPLUG_CPU
default y
@@ -74,29 +74,14 @@ config PM_SLEEP
depends on SUSPEND || HIBERNATION
default y
 
-config SUSPEND_UP_POSSIBLE
-   bool
-   depends on (X86  !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
-  || SUPERH || FRV
-   depends on !SMP
-   default y
-
-config SUSPEND_SMP_POSSIBLE
-   bool
-   depends on (X86  !X86_VOYAGER) \
-  || (PPC  (PPC_PSERIES || PPC_PMAC)) || ARM
-   depends on SMP
-   default y
-
 config SUSPEND
bool Suspend to RAM and standby
-   depends on PM
-   depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
+   depends on PM  ARCH_SUSPEND_POSSIBLE
default y
---help---
  Allow the system to enter sleep states in which main memory is
  powered and thus its contents are preserved, such as the
- suspend-to-RAM state (i.e. the ACPI S3 state).
+ suspend-to-RAM state (e.g. the ACPI S3 state).
 
 config HIBERNATION
bool Hibernation (aka 'suspend to disk')
--- everything.orig/arch/blackfin/Kconfig   2007-11-07 14:44:55.551521971 
+0100
+++ everything/arch/blackfin/Kconfig2007-11-07 14:45:28.641531465 +0100
@@ -993,6 +993,10 @@ endmenu
 menu Power management options
 source kernel/power/Kconfig
 
+config ARCH_SUSPEND_POSSIBLE
+   def_bool y
+   depends on !SMP
+
 choice
prompt Select PM Wakeup Event Source
default PM_WAKEUP_GPIO_BY_SIC_IWR
--- everything.orig/arch/arm/Kconfig2007-11-07 14:44:55.651522948 +0100
+++ everything/arch/arm/Kconfig 2007-11-07 14:45:28.641531465 +0100
@@ -977,6 +977,9 @@ menu Power management options
 
 source kernel/power/Kconfig
 
+config ARCH_SUSPEND_POSSIBLE
+   def_bool y
+
 endmenu
 
 source net/Kconfig
--- everything.orig/arch/mips/Kconfig   2007-11-07 14:44:55.701522460 +0100
+++ everything/arch/mips/Kconfig2007-11-07 14:45:28.641531465 +0100
@@ -1999,6 +1999,10 @@ endmenu
 
 menu Power management options
 
+config ARCH_SUSPEND_POSSIBLE
+   def_bool y
+   depends on !SMP
+
 source kernel/power/Kconfig
 
 endmenu
--- everything.orig/arch/sh/Kconfig 2007-11-07 14:44:55.801520344 +0100
+++ everything/arch/sh/Kconfig  2007-11-07 14:45:28.651528536 +0100
@@ -748,6 +748,10 @@ endmenu
 menu Power management options (EXPERIMENTAL)
 depends on EXPERIMENTAL  SYS_SUPPORTS_PM
 
+config ARCH_SUSPEND_POSSIBLE
+   def_bool y
+   depends on !SMP
+
 source kernel/power/Kconfig
 
 endmenu
--- everything.orig/arch/frv/Kconfig2007-11-07 14:44:55.861520941 +0100

Re: [PATCH (2.6.25) 2/2] suspend: clean up Kconfig

2007-11-07 Thread Rafael J. Wysocki 
On Wednesday, 7 of November 2007, Johannes Berg wrote:
 This cleans up the suspend Kconfig and removes the need to
 declare centrally which architectures support suspend. All
 architectures that currently support suspend are modified
 accordingly.
 
 Signed-off-by: Johannes Berg [EMAIL PROTECTED]

Acked-by: Rafael J. Wysocki [EMAIL PROTECTED]

 Cc: linuxppc-dev@ozlabs.org
 Cc: [EMAIL PROTECTED]
 Cc: Guennadi Liakhovetski [EMAIL PROTECTED]
 Cc: Scott Wood [EMAIL PROTECTED]
 Cc: David Howells [EMAIL PROTECTED]
 Cc: Ralf Baechle [EMAIL PROTECTED]
 Cc: [EMAIL PROTECTED]
 Cc: Paul Mundt [EMAIL PROTECTED]
 Cc: Bryan Wu [EMAIL PROTECTED]
 Cc: Russell King [EMAIL PROTECTED]
 ---
 Architecture maintainers should evaluate whether their
 ARCH_SUSPEND_POSSIBLE symbol should be set only under
 stricter circumstances like I've done for powerpc.
 
 Always setting it is not usually a problem, however, since the
 infrastructure is only available for use after suspend_set_ops().
 
  arch/arm/Kconfig  |3 +++
  arch/blackfin/Kconfig |4 
  arch/frv/Kconfig  |5 +
  arch/i386/Kconfig |4 
  arch/mips/Kconfig |4 
  arch/powerpc/Kconfig  |4 
  arch/sh/Kconfig   |4 
  arch/x86_64/Kconfig   |3 +++
  kernel/power/Kconfig  |   21 +++--
  9 files changed, 34 insertions(+), 18 deletions(-)
 
 --- everything.orig/arch/i386/Kconfig 2007-11-07 14:45:28.591544215 +0100
 +++ everything/arch/i386/Kconfig  2007-11-07 14:45:28.631515461 +0100
 @@ -1323,3 +1323,7 @@ config KTIME_SCALAR
  config ARCH_HIBERNATION_POSSIBLE
   def_bool y
   depends on !SMP || !X86_VOYAGER
 +
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on !X86_VOYAGER
 --- everything.orig/arch/x86_64/Kconfig   2007-11-07 14:45:28.591544215 
 +0100
 +++ everything/arch/x86_64/Kconfig2007-11-07 14:45:28.631515461 +0100
 @@ -716,6 +716,9 @@ menu Power management options
  
  source kernel/power/Kconfig
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 +
  config ARCH_HIBERNATION_POSSIBLE
   def_bool y
  
 --- everything.orig/kernel/power/Kconfig  2007-11-07 14:45:28.591544215 
 +0100
 +++ everything/kernel/power/Kconfig   2007-11-07 14:45:28.641531465 +0100
 @@ -64,7 +64,7 @@ config PM_TRACE
  config PM_SLEEP_SMP
   bool
   depends on SMP
 - depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 + depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
   depends on PM_SLEEP
   select HOTPLUG_CPU
   default y
 @@ -74,29 +74,14 @@ config PM_SLEEP
   depends on SUSPEND || HIBERNATION
   default y
  
 -config SUSPEND_UP_POSSIBLE
 - bool
 - depends on (X86  !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
 -|| SUPERH || FRV
 - depends on !SMP
 - default y
 -
 -config SUSPEND_SMP_POSSIBLE
 - bool
 - depends on (X86  !X86_VOYAGER) \
 -|| (PPC  (PPC_PSERIES || PPC_PMAC)) || ARM
 - depends on SMP
 - default y
 -
  config SUSPEND
   bool Suspend to RAM and standby
 - depends on PM
 - depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
 + depends on PM  ARCH_SUSPEND_POSSIBLE
   default y
   ---help---
 Allow the system to enter sleep states in which main memory is
 powered and thus its contents are preserved, such as the
 -   suspend-to-RAM state (i.e. the ACPI S3 state).
 +   suspend-to-RAM state (e.g. the ACPI S3 state).
  
  config HIBERNATION
   bool Hibernation (aka 'suspend to disk')
 --- everything.orig/arch/blackfin/Kconfig 2007-11-07 14:44:55.551521971 
 +0100
 +++ everything/arch/blackfin/Kconfig  2007-11-07 14:45:28.641531465 +0100
 @@ -993,6 +993,10 @@ endmenu
  menu Power management options
  source kernel/power/Kconfig
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on !SMP
 +
  choice
   prompt Select PM Wakeup Event Source
   default PM_WAKEUP_GPIO_BY_SIC_IWR
 --- everything.orig/arch/arm/Kconfig  2007-11-07 14:44:55.651522948 +0100
 +++ everything/arch/arm/Kconfig   2007-11-07 14:45:28.641531465 +0100
 @@ -977,6 +977,9 @@ menu Power management options
  
  source kernel/power/Kconfig
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 +
  endmenu
  
  source net/Kconfig
 --- everything.orig/arch/mips/Kconfig 2007-11-07 14:44:55.701522460 +0100
 +++ everything/arch/mips/Kconfig  2007-11-07 14:45:28.641531465 +0100
 @@ -1999,6 +1999,10 @@ endmenu
  
  menu Power management options
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on !SMP
 +
  source kernel/power/Kconfig
  
  endmenu
 --- everything.orig/arch/sh/Kconfig   2007-11-07 14:44:55.801520344 +0100
 +++ everything/arch/sh/Kconfig2007-11-07 14:45:28.651528536 +0100
 @@ -748,6 +748,10 @@ endmenu
  menu Power management options (EXPERIMENTAL)
  depends on EXPERIMENTAL  SYS_SUPPORTS_PM
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on

Re: [PATCH (2.6.25) 2/2] suspend: clean up Kconfig

2007-11-07 Thread Russell King 
On Wed, Nov 07, 2007 at 02:58:00PM +0100, Johannes Berg wrote:
 This cleans up the suspend Kconfig and removes the need to
 declare centrally which architectures support suspend. All
 architectures that currently support suspend are modified
 accordingly.
 
 Signed-off-by: Johannes Berg [EMAIL PROTECTED]
 Cc: Rafael J. Wysocki [EMAIL PROTECTED]
 Cc: linuxppc-dev@ozlabs.org
 Cc: [EMAIL PROTECTED]
 Cc: Guennadi Liakhovetski [EMAIL PROTECTED]
 Cc: Scott Wood [EMAIL PROTECTED]
 Cc: David Howells [EMAIL PROTECTED]
 Cc: Ralf Baechle [EMAIL PROTECTED]
 Cc: [EMAIL PROTECTED]
 Cc: Paul Mundt [EMAIL PROTECTED]
 Cc: Bryan Wu [EMAIL PROTECTED]

Acked-by: Russell King [EMAIL PROTECTED]

 ---
 Architecture maintainers should evaluate whether their
 ARCH_SUSPEND_POSSIBLE symbol should be set only under
 stricter circumstances like I've done for powerpc.
 
 Always setting it is not usually a problem, however, since the
 infrastructure is only available for use after suspend_set_ops().
 
  arch/arm/Kconfig  |3 +++
  arch/blackfin/Kconfig |4 
  arch/frv/Kconfig  |5 +
  arch/i386/Kconfig |4 
  arch/mips/Kconfig |4 
  arch/powerpc/Kconfig  |4 
  arch/sh/Kconfig   |4 
  arch/x86_64/Kconfig   |3 +++
  kernel/power/Kconfig  |   21 +++--
  9 files changed, 34 insertions(+), 18 deletions(-)
 
 --- everything.orig/arch/i386/Kconfig 2007-11-07 14:45:28.591544215 +0100
 +++ everything/arch/i386/Kconfig  2007-11-07 14:45:28.631515461 +0100
 @@ -1323,3 +1323,7 @@ config KTIME_SCALAR
  config ARCH_HIBERNATION_POSSIBLE
   def_bool y
   depends on !SMP || !X86_VOYAGER
 +
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on !X86_VOYAGER
 --- everything.orig/arch/x86_64/Kconfig   2007-11-07 14:45:28.591544215 
 +0100
 +++ everything/arch/x86_64/Kconfig2007-11-07 14:45:28.631515461 +0100
 @@ -716,6 +716,9 @@ menu Power management options
  
  source kernel/power/Kconfig
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 +
  config ARCH_HIBERNATION_POSSIBLE
   def_bool y
  
 --- everything.orig/kernel/power/Kconfig  2007-11-07 14:45:28.591544215 
 +0100
 +++ everything/kernel/power/Kconfig   2007-11-07 14:45:28.641531465 +0100
 @@ -64,7 +64,7 @@ config PM_TRACE
  config PM_SLEEP_SMP
   bool
   depends on SMP
 - depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
 + depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
   depends on PM_SLEEP
   select HOTPLUG_CPU
   default y
 @@ -74,29 +74,14 @@ config PM_SLEEP
   depends on SUSPEND || HIBERNATION
   default y
  
 -config SUSPEND_UP_POSSIBLE
 - bool
 - depends on (X86  !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
 -|| SUPERH || FRV
 - depends on !SMP
 - default y
 -
 -config SUSPEND_SMP_POSSIBLE
 - bool
 - depends on (X86  !X86_VOYAGER) \
 -|| (PPC  (PPC_PSERIES || PPC_PMAC)) || ARM
 - depends on SMP
 - default y
 -
  config SUSPEND
   bool Suspend to RAM and standby
 - depends on PM
 - depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
 + depends on PM  ARCH_SUSPEND_POSSIBLE
   default y
   ---help---
 Allow the system to enter sleep states in which main memory is
 powered and thus its contents are preserved, such as the
 -   suspend-to-RAM state (i.e. the ACPI S3 state).
 +   suspend-to-RAM state (e.g. the ACPI S3 state).
  
  config HIBERNATION
   bool Hibernation (aka 'suspend to disk')
 --- everything.orig/arch/blackfin/Kconfig 2007-11-07 14:44:55.551521971 
 +0100
 +++ everything/arch/blackfin/Kconfig  2007-11-07 14:45:28.641531465 +0100
 @@ -993,6 +993,10 @@ endmenu
  menu Power management options
  source kernel/power/Kconfig
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on !SMP
 +
  choice
   prompt Select PM Wakeup Event Source
   default PM_WAKEUP_GPIO_BY_SIC_IWR
 --- everything.orig/arch/arm/Kconfig  2007-11-07 14:44:55.651522948 +0100
 +++ everything/arch/arm/Kconfig   2007-11-07 14:45:28.641531465 +0100
 @@ -977,6 +977,9 @@ menu Power management options
  
  source kernel/power/Kconfig
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 +
  endmenu
  
  source net/Kconfig
 --- everything.orig/arch/mips/Kconfig 2007-11-07 14:44:55.701522460 +0100
 +++ everything/arch/mips/Kconfig  2007-11-07 14:45:28.641531465 +0100
 @@ -1999,6 +1999,10 @@ endmenu
  
  menu Power management options
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 + depends on !SMP
 +
  source kernel/power/Kconfig
  
  endmenu
 --- everything.orig/arch/sh/Kconfig   2007-11-07 14:44:55.801520344 +0100
 +++ everything/arch/sh/Kconfig2007-11-07 14:45:28.651528536 +0100
 @@ -748,6 +748,10 @@ endmenu
  menu Power management options (EXPERIMENTAL)
  depends on EXPERIMENTAL  SYS_SUPPORTS_PM
  
 +config ARCH_SUSPEND_POSSIBLE
 + def_bool y
 +

Re: [PATCH (2.6.25) 2/2] suspend: clean up Kconfig

2007-11-07 Thread Paul Mackerras 
Johannes Berg writes:

 This cleans up the suspend Kconfig and removes the need to
 declare centrally which architectures support suspend. All
 architectures that currently support suspend are modified
 accordingly.

Acked-by: Paul Mackerras [EMAIL PROTECTED]
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev