From c3913a185de9eac251ccc0e08b41236ddddbafb0 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Fri, 30 Jun 2006 18:59:59 +0200 Subject: [PATCH] --- yaml --- r: 31509 b: refs/heads/master c: e02169b682bc448ccdc819dc8639ed34a23cedd8 h: refs/heads/master i: 31507: e7ba2509db5798a519be1b59cd38df480fb836ab v: v3 --- [refs] | 2 +- trunk/kernel/power/Kconfig | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index dee661a925da..f2a08795d706 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcb4ee8852e2e9326e102f0910c029de45afabba +refs/heads/master: e02169b682bc448ccdc819dc8639ed34a23cedd8 diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index 857b4fa09124..ae44a70aae8a 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/kernel/power/Kconfig @@ -100,18 +100,6 @@ config PM_STD_PARTITION suspended image to. It will simply pick the first available swap device. -config SWSUSP_ENCRYPT - bool "Encrypt suspend image" - depends on SOFTWARE_SUSPEND && CRYPTO=y && (CRYPTO_AES=y || CRYPTO_AES_586=y || CRYPTO_AES_X86_64=y) - default "" - ---help--- - To prevent data gathering from swap after resume you can encrypt - the suspend image with a temporary key that is deleted on - resume. - - Note that the temporary key is stored unencrypted on disk while the - system is suspended. - config SUSPEND_SMP bool depends on HOTPLUG_CPU && X86 && PM