diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /kernel | |
parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Remove obsolete #include <linux/config.h>
remove obsolete swsusp_encrypt
arch/arm26/Kconfig typos
Documentation/IPMI typos
Kconfig: Typos in net/sched/Kconfig
v9fs: do not include linux/version.h
Documentation/DocBook/mtdnand.tmpl: typo fixes
typo fixes: specfic -> specific
typo fixes in Documentation/networking/pktgen.txt
typo fixes: occuring -> occurring
typo fixes: infomation -> information
typo fixes: disadvantadge -> disadvantage
typo fixes: aquire -> acquire
typo fixes: mecanism -> mechanism
typo fixes: bandwith -> bandwidth
fix a typo in the RTC_CLASS help text
smb is no longer maintained
Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/acct.c | 1 | ||||
-rw-r--r-- | kernel/configs.c | 1 | ||||
-rw-r--r-- | kernel/cpuset.c | 3 | ||||
-rw-r--r-- | kernel/exec_domain.c | 1 | ||||
-rw-r--r-- | kernel/exit.c | 1 | ||||
-rw-r--r-- | kernel/fork.c | 1 | ||||
-rw-r--r-- | kernel/irq/manage.c | 1 | ||||
-rw-r--r-- | kernel/kmod.c | 1 | ||||
-rw-r--r-- | kernel/ksysfs.c | 1 | ||||
-rw-r--r-- | kernel/module.c | 1 | ||||
-rw-r--r-- | kernel/panic.c | 1 | ||||
-rw-r--r-- | kernel/params.c | 1 | ||||
-rw-r--r-- | kernel/power/Kconfig | 12 | ||||
-rw-r--r-- | kernel/printk.c | 1 | ||||
-rw-r--r-- | kernel/profile.c | 1 | ||||
-rw-r--r-- | kernel/resource.c | 1 | ||||
-rw-r--r-- | kernel/signal.c | 1 | ||||
-rw-r--r-- | kernel/spinlock.c | 1 | ||||
-rw-r--r-- | kernel/sys.c | 1 | ||||
-rw-r--r-- | kernel/sysctl.c | 1 | ||||
-rw-r--r-- | kernel/wait.c | 1 |
21 files changed, 1 insertions, 33 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index 126ca43d5d2..f18e0b8df3e 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
@@ -43,7 +43,6 @@ | |||
43 | * a struct file opened for write. Fixed. 2/6/2000, AV. | 43 | * a struct file opened for write. Fixed. 2/6/2000, AV. |
44 | */ | 44 | */ |
45 | 45 | ||
46 | #include <linux/config.h> | ||
47 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |
48 | #include <linux/slab.h> | 47 | #include <linux/slab.h> |
49 | #include <linux/acct.h> | 48 | #include <linux/acct.h> |
diff --git a/kernel/configs.c b/kernel/configs.c index 009e1ebdcb8..f9e31974f4a 100644 --- a/kernel/configs.c +++ b/kernel/configs.c | |||
@@ -23,7 +23,6 @@ | |||
23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/config.h> | ||
27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
29 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 1535af3a912..c232dc07743 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -18,7 +18,6 @@ | |||
18 | * distribution for more details. | 18 | * distribution for more details. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | #include <linux/cpu.h> | 21 | #include <linux/cpu.h> |
23 | #include <linux/cpumask.h> | 22 | #include <linux/cpumask.h> |
24 | #include <linux/cpuset.h> | 23 | #include <linux/cpuset.h> |
@@ -1064,7 +1063,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf) | |||
1064 | } | 1063 | } |
1065 | 1064 | ||
1066 | /* | 1065 | /* |
1067 | * Frequency meter - How fast is some event occuring? | 1066 | * Frequency meter - How fast is some event occurring? |
1068 | * | 1067 | * |
1069 | * These routines manage a digitally filtered, constant time based, | 1068 | * These routines manage a digitally filtered, constant time based, |
1070 | * event frequency meter. There are four routines: | 1069 | * event frequency meter. There are four routines: |
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index c01cead2cfd..3c2eaea66b1 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * 2001-05-06 Complete rewrite, Christoph Hellwig (hch@infradead.org) | 7 | * 2001-05-06 Complete rewrite, Christoph Hellwig (hch@infradead.org) |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
13 | #include <linux/kmod.h> | 12 | #include <linux/kmod.h> |
diff --git a/kernel/exit.c b/kernel/exit.c index ab06b9f88f6..7f7ef225855 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/config.h> | ||
8 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
9 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
10 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
diff --git a/kernel/fork.c b/kernel/fork.c index 628198a4f28..9064bf9e131 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -11,7 +11,6 @@ | |||
11 | * management can be a bitch. See 'mm/memory.c': 'copy_page_range()' | 11 | * management can be a bitch. See 'mm/memory.c': 'copy_page_range()' |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
17 | #include <linux/unistd.h> | 16 | #include <linux/unistd.h> |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 9eb1d518ee1..b7117e81ac5 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * This file contains driver APIs to the irq subsystem. | 7 | * This file contains driver APIs to the irq subsystem. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
13 | #include <linux/random.h> | 12 | #include <linux/random.h> |
diff --git a/kernel/kmod.c b/kernel/kmod.c index 20a997c73c3..1b7157af051 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -20,7 +20,6 @@ | |||
20 | */ | 20 | */ |
21 | #define __KERNEL_SYSCALLS__ | 21 | #define __KERNEL_SYSCALLS__ |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
26 | #include <linux/syscalls.h> | 25 | #include <linux/syscalls.h> |
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 9e28478a17a..e0ffe4ab091 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c | |||
@@ -8,7 +8,6 @@ | |||
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/config.h> | ||
12 | #include <linux/kobject.h> | 11 | #include <linux/kobject.h> |
13 | #include <linux/string.h> | 12 | #include <linux/string.h> |
14 | #include <linux/sysfs.h> | 13 | #include <linux/sysfs.h> |
diff --git a/kernel/module.c b/kernel/module.c index 99c022ac3d2..281172f01e9 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -16,7 +16,6 @@ | |||
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | */ | 18 | */ |
19 | #include <linux/config.h> | ||
20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
21 | #include <linux/moduleloader.h> | 20 | #include <linux/moduleloader.h> |
22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
diff --git a/kernel/panic.c b/kernel/panic.c index cc2a4c9c36a..ab13f0f668b 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
@@ -8,7 +8,6 @@ | |||
8 | * This function is used through-out the kernel (including mm and fs) | 8 | * This function is used through-out the kernel (including mm and fs) |
9 | * to indicate a major problem. | 9 | * to indicate a major problem. |
10 | */ | 10 | */ |
11 | #include <linux/config.h> | ||
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
diff --git a/kernel/params.c b/kernel/params.c index af43ecdc8d9..91aea7aa532 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -15,7 +15,6 @@ | |||
15 | along with this program; if not, write to the Free Software | 15 | along with this program; if not, write to the Free Software |
16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ | 17 | */ |
18 | #include <linux/config.h> | ||
19 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 857b4fa0912..ae44a70aae8 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
@@ -100,18 +100,6 @@ config PM_STD_PARTITION | |||
100 | suspended image to. It will simply pick the first available swap | 100 | suspended image to. It will simply pick the first available swap |
101 | device. | 101 | device. |
102 | 102 | ||
103 | config SWSUSP_ENCRYPT | ||
104 | bool "Encrypt suspend image" | ||
105 | depends on SOFTWARE_SUSPEND && CRYPTO=y && (CRYPTO_AES=y || CRYPTO_AES_586=y || CRYPTO_AES_X86_64=y) | ||
106 | default "" | ||
107 | ---help--- | ||
108 | To prevent data gathering from swap after resume you can encrypt | ||
109 | the suspend image with a temporary key that is deleted on | ||
110 | resume. | ||
111 | |||
112 | Note that the temporary key is stored unencrypted on disk while the | ||
113 | system is suspended. | ||
114 | |||
115 | config SUSPEND_SMP | 103 | config SUSPEND_SMP |
116 | bool | 104 | bool |
117 | depends on HOTPLUG_CPU && X86 && PM | 105 | depends on HOTPLUG_CPU && X86 && PM |
diff --git a/kernel/printk.c b/kernel/printk.c index 95b7fe17f12..39ae24d2a41 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
28 | #include <linux/interrupt.h> /* For in_interrupt() */ | 28 | #include <linux/interrupt.h> /* For in_interrupt() */ |
29 | #include <linux/config.h> | ||
30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
31 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
32 | #include <linux/security.h> | 31 | #include <linux/security.h> |
diff --git a/kernel/profile.c b/kernel/profile.c index 5a730fdb1a2..d5bd75e7501 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * to resolve timer interrupt livelocks, William Irwin, Oracle, 2004 | 13 | * to resolve timer interrupt livelocks, William Irwin, Oracle, 2004 |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/module.h> | 16 | #include <linux/module.h> |
18 | #include <linux/profile.h> | 17 | #include <linux/profile.h> |
19 | #include <linux/bootmem.h> | 18 | #include <linux/bootmem.h> |
diff --git a/kernel/resource.c b/kernel/resource.c index bf1130d81b7..129cf046e56 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * Arbitrary resource management. | 7 | * Arbitrary resource management. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
12 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
diff --git a/kernel/signal.c b/kernel/signal.c index 477d11adf3d..7fe874d12fa 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * to allow signals to be sent reliably. | 10 | * to allow signals to be sent reliably. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
16 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
diff --git a/kernel/spinlock.c b/kernel/spinlock.c index d1b810782bc..b31e54eadf5 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * SMP and the DEBUG_SPINLOCK cases. (UP-nondebug inlines them) | 9 | * SMP and the DEBUG_SPINLOCK cases. (UP-nondebug inlines them) |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
14 | #include <linux/preempt.h> | 13 | #include <linux/preempt.h> |
15 | #include <linux/spinlock.h> | 14 | #include <linux/spinlock.h> |
diff --git a/kernel/sys.c b/kernel/sys.c index 2d5179c67ce..dbb3b9c7ea6 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/config.h> | ||
8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
9 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
10 | #include <linux/utsname.h> | 9 | #include <linux/utsname.h> |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ee0db45e243..99a58f27907 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -18,7 +18,6 @@ | |||
18 | * Removed it and replaced it with older style, 03/23/00, Bill Wendling | 18 | * Removed it and replaced it with older style, 03/23/00, Bill Wendling |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
24 | #include <linux/swap.h> | 23 | #include <linux/swap.h> |
diff --git a/kernel/wait.c b/kernel/wait.c index 791681cfea9..5985d866531 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * | 3 | * |
4 | * (C) 2004 William Irwin, Oracle | 4 | * (C) 2004 William Irwin, Oracle |
5 | */ | 5 | */ |
6 | #include <linux/config.h> | ||
7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
9 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |