From 80f7228b59e4bbe9d840af3ff0f2fe480d6e7c79 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 30 Jun 2006 18:27:16 +0200 Subject: typo fixes: occuring -> occurring Signed-off-by: Adrian Bunk --- kernel/cpuset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 1535af3a91..ee8c6dfd92 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1064,7 +1064,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf) } /* - * Frequency meter - How fast is some event occuring? + * Frequency meter - How fast is some event occurring? * * These routines manage a digitally filtered, constant time based, * event frequency meter. There are four routines: -- cgit v1.2.2 From e02169b682bc448ccdc819dc8639ed34a23cedd8 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Fri, 30 Jun 2006 18:59:59 +0200 Subject: remove obsolete swsusp_encrypt Remove SWSUSP_ENCRYPT config option; it is no longer implemented. Signed-off-by: Pavel Machek Signed-off-by: Adrian Bunk --- kernel/power/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'kernel') diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 857b4fa091..ae44a70aae 100644 --- a/kernel/power/Kconfig +++ b/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 -- cgit v1.2.2 From 6ab3d5624e172c553004ecc862bfeac16d9d68b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Engel?= Date: Fri, 30 Jun 2006 19:25:36 +0200 Subject: Remove obsolete #include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Engel Signed-off-by: Adrian Bunk --- kernel/acct.c | 1 - kernel/configs.c | 1 - kernel/cpuset.c | 1 - kernel/exec_domain.c | 1 - kernel/exit.c | 1 - kernel/fork.c | 1 - kernel/irq/manage.c | 1 - kernel/kmod.c | 1 - kernel/ksysfs.c | 1 - kernel/module.c | 1 - kernel/panic.c | 1 - kernel/params.c | 1 - kernel/printk.c | 1 - kernel/profile.c | 1 - kernel/resource.c | 1 - kernel/signal.c | 1 - kernel/spinlock.c | 1 - kernel/sys.c | 1 - kernel/sysctl.c | 1 - kernel/wait.c | 1 - 20 files changed, 20 deletions(-) (limited to 'kernel') diff --git a/kernel/acct.c b/kernel/acct.c index 126ca43d5d..f18e0b8df3 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -43,7 +43,6 @@ * a struct file opened for write. Fixed. 2/6/2000, AV. */ -#include #include #include #include diff --git a/kernel/configs.c b/kernel/configs.c index 009e1ebdcb..f9e31974f4 100644 --- a/kernel/configs.c +++ b/kernel/configs.c @@ -23,7 +23,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/kernel/cpuset.c b/kernel/cpuset.c index ee8c6dfd92..c232dc0774 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -18,7 +18,6 @@ * distribution for more details. */ -#include #include #include #include diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index c01cead2cf..3c2eaea66b 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c @@ -7,7 +7,6 @@ * 2001-05-06 Complete rewrite, Christoph Hellwig (hch@infradead.org) */ -#include #include #include #include diff --git a/kernel/exit.c b/kernel/exit.c index ab06b9f88f..7f7ef22585 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -4,7 +4,6 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include #include #include #include diff --git a/kernel/fork.c b/kernel/fork.c index 628198a4f2..9064bf9e13 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -11,7 +11,6 @@ * management can be a bitch. See 'mm/memory.c': 'copy_page_range()' */ -#include #include #include #include diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 9eb1d518ee..b7117e81ac 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -7,7 +7,6 @@ * This file contains driver APIs to the irq subsystem. */ -#include #include #include #include diff --git a/kernel/kmod.c b/kernel/kmod.c index 20a997c73c..1b7157af05 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -20,7 +20,6 @@ */ #define __KERNEL_SYSCALLS__ -#include #include #include #include diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 9e28478a17..e0ffe4ab09 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c @@ -8,7 +8,6 @@ * */ -#include #include #include #include diff --git a/kernel/module.c b/kernel/module.c index 99c022ac3d..281172f01e 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -16,7 +16,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include #include diff --git a/kernel/panic.c b/kernel/panic.c index cc2a4c9c36..ab13f0f668 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -8,7 +8,6 @@ * This function is used through-out the kernel (including mm and fs) * to indicate a major problem. */ -#include #include #include #include diff --git a/kernel/params.c b/kernel/params.c index af43ecdc8d..91aea7aa53 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include #include diff --git a/kernel/printk.c b/kernel/printk.c index 95b7fe17f1..39ae24d2a4 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -26,7 +26,6 @@ #include #include #include /* For in_interrupt() */ -#include #include #include #include diff --git a/kernel/profile.c b/kernel/profile.c index 5a730fdb1a..d5bd75e750 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -13,7 +13,6 @@ * to resolve timer interrupt livelocks, William Irwin, Oracle, 2004 */ -#include #include #include #include diff --git a/kernel/resource.c b/kernel/resource.c index bf1130d81b..129cf046e5 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -7,7 +7,6 @@ * Arbitrary resource management. */ -#include #include #include #include diff --git a/kernel/signal.c b/kernel/signal.c index 52adf53929..ecb610d0dc 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -10,7 +10,6 @@ * to allow signals to be sent reliably. */ -#include #include #include #include diff --git a/kernel/spinlock.c b/kernel/spinlock.c index d1b810782b..b31e54eadf 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c @@ -9,7 +9,6 @@ * SMP and the DEBUG_SPINLOCK cases. (UP-nondebug inlines them) */ -#include #include #include #include diff --git a/kernel/sys.c b/kernel/sys.c index 2d5179c67c..dbb3b9c7ea 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -4,7 +4,6 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include #include #include #include diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 93a2c53986..6399c91e7b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -18,7 +18,6 @@ * Removed it and replaced it with older style, 03/23/00, Bill Wendling */ -#include #include #include #include diff --git a/kernel/wait.c b/kernel/wait.c index 791681cfea..5985d86653 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -3,7 +3,6 @@ * * (C) 2004 William Irwin, Oracle */ -#include #include #include #include -- cgit v1.2.2