Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82384
b: refs/heads/master
c: 801e406
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Berg authored and Len Brown committed Feb 1, 2008
1 parent 20f0ae3 commit 52e4d40
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23976728a48c3b76d34e17ead19addd52b3a280e
refs/heads/master: 801e4062fda6496fe9bee3e6915a2aa108f974e5
14 changes: 12 additions & 2 deletions trunk/arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,19 @@ config DEFAULT_UIMAGE
config REDBOOT
bool

config PPC64_SWSUSP
config HIBERNATE_32
bool
depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
depends on (PPC_PMAC && !SMP) || BROKEN
default y

config HIBERNATE_64
bool
depends on BROKEN || (PPC_PMAC64 && EXPERIMENTAL)
default y

config ARCH_HIBERNATION_POSSIBLE
bool
depends on (PPC64 && HIBERNATE_64) || (PPC32 && HIBERNATE_32)
default y

config PPC_DCR_NATIVE
Expand Down
4 changes: 4 additions & 0 deletions trunk/arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ config ARCH_SUPPORTS_OPROFILE

select HAVE_KVM

config ARCH_HIBERNATION_POSSIBLE
def_bool y
depends on !SMP || !X86_VOYAGER

config ZONE_DMA32
bool
default X86_64
Expand Down
18 changes: 3 additions & 15 deletions trunk/kernel/power/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ config PM_TRACE_RTC

config PM_SLEEP_SMP
bool
depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
depends on SMP
depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP
select HOTPLUG_CPU
default y
Expand Down Expand Up @@ -118,22 +119,9 @@ config SUSPEND
powered and thus its contents are preserved, such as the
suspend-to-RAM state (i.e. the ACPI S3 state).

config HIBERNATION_UP_POSSIBLE
bool
depends on X86 || PPC64_SWSUSP || PPC32
depends on !SMP
default y

config HIBERNATION_SMP_POSSIBLE
bool
depends on (X86 && !X86_VOYAGER) || PPC64_SWSUSP
depends on SMP
default y

config HIBERNATION
bool "Hibernation (aka 'suspend to disk')"
depends on PM && SWAP
depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
---help---
Enable the suspend to disk (STD) functionality, which is usually
called "hibernation" in user interfaces. STD checkpoints the
Expand Down

0 comments on commit 52e4d40

Please sign in to comment.