aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS10
-rw-r--r--Documentation/00-INDEX4
-rw-r--r--Documentation/cgroups/00-INDEX18
-rw-r--r--Documentation/cgroups/cgroups.txt10
-rw-r--r--Documentation/cgroups/cpusets.txt12
-rw-r--r--Documentation/cgroups/devices.txt2
-rw-r--r--Documentation/cgroups/memcg_test.txt2
-rw-r--r--Documentation/cgroups/memory.txt2
-rw-r--r--Documentation/filesystems/ext3.txt14
-rw-r--r--Documentation/ia64/kvm.txt2
-rw-r--r--Documentation/kernel-parameters.txt4
-rw-r--r--Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt2
-rw-r--r--Documentation/scheduler/sched-rt-group.txt2
-rw-r--r--Documentation/vm/numa_memory_policy.txt3
-rw-r--r--Documentation/vm/page_migration3
-rw-r--r--Documentation/x86/x86_64/fake-numa-for-cpusets5
-rw-r--r--MAINTAINERS11
-rw-r--r--arch/arm/mach-netx/include/mach/netx-regs.h2
-rw-r--r--arch/arm/mach-omap1/Kconfig2
-rw-r--r--arch/avr32/Kconfig6
-rw-r--r--arch/blackfin/Kconfig6
-rw-r--r--arch/cris/Kconfig6
-rw-r--r--arch/cris/arch-v32/Kconfig2
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig2
-rw-r--r--arch/cris/arch-v32/mach-fs/Kconfig2
-rw-r--r--arch/h8300/kernel/timer/tpu.c2
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mips/sgi-ip27/ip27-smp.c2
-rw-r--r--arch/powerpc/Kconfig2
-rw-r--r--arch/powerpc/platforms/Kconfig2
-rw-r--r--arch/powerpc/sysdev/bestcomm/Kconfig4
-rw-r--r--arch/sh/Kconfig4
-rw-r--r--arch/sparc/kernel/head_64.S2
-rw-r--r--arch/x86/Kconfig4
-rw-r--r--drivers/acpi/thermal.c2
-rw-r--r--drivers/ata/Kconfig2
-rw-r--r--drivers/base/sys.c2
-rw-r--r--drivers/char/bsr.c2
-rw-r--r--drivers/gpio/Kconfig6
-rw-r--r--drivers/hid/Kconfig2
-rw-r--r--drivers/hwmon/f75375s.c4
-rw-r--r--drivers/input/Kconfig2
-rw-r--r--drivers/input/mouse/gpio_mouse.c2
-rw-r--r--drivers/input/touchscreen/ads7846.c2
-rw-r--r--drivers/isdn/mISDN/Kconfig10
-rw-r--r--drivers/isdn/mISDN/l1oip_codec.c2
-rw-r--r--drivers/leds/Kconfig6
-rw-r--r--drivers/leds/leds-pca9532.c4
-rw-r--r--drivers/media/common/tuners/Kconfig2
-rw-r--r--drivers/media/dvb/frontends/Kconfig2
-rw-r--r--drivers/media/dvb/frontends/drx397xD.c2
-rw-r--r--drivers/mfd/Kconfig2
-rw-r--r--drivers/misc/Kconfig6
-rw-r--r--drivers/mmc/host/Kconfig2
-rw-r--r--drivers/mtd/nand/diskonchip.c2
-rw-r--r--drivers/mtd/tests/mtd_oobtest.c24
-rw-r--r--drivers/mtd/tests/mtd_readtest.c2
-rw-r--r--drivers/net/sb1250-mac.c2
-rw-r--r--drivers/net/skfp/h/hwmtm.h2
-rw-r--r--drivers/net/tg3.c2
-rw-r--r--drivers/net/wan/farsync.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
-rw-r--r--drivers/net/wireless/libertas/cmd.c2
-rw-r--r--drivers/pci/pci.c2
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c2
-rw-r--r--drivers/power/bq27x00_battery.c2
-rw-r--r--drivers/scsi/Kconfig4
-rw-r--r--drivers/serial/Kconfig2
-rw-r--r--drivers/staging/Kconfig4
-rw-r--r--drivers/staging/comedi/Kconfig4
-rw-r--r--drivers/staging/go7007/Kconfig4
-rw-r--r--drivers/staging/otus/hal/hpmain.c2
-rw-r--r--drivers/staging/panel/Kconfig2
-rw-r--r--drivers/usb/atm/ueagle-atm.c2
-rw-r--r--drivers/usb/gadget/Kconfig2
-rw-r--r--drivers/usb/serial/ChangeLog.history2
-rw-r--r--drivers/usb/serial/Kconfig4
-rw-r--r--drivers/usb/wusbcore/security.c2
-rw-r--r--drivers/uwb/Kconfig4
-rw-r--r--drivers/xen/Kconfig2
-rw-r--r--fs/bio.c3
-rw-r--r--fs/ext4/Kconfig2
-rw-r--r--fs/file_table.c1
-rw-r--r--fs/fs-writeback.c2
-rw-r--r--fs/proc/nommu.c2
-rw-r--r--fs/ubifs/Kconfig4
-rw-r--r--include/linux/cgroup.h5
-rw-r--r--include/linux/jbd.h2
-rw-r--r--include/linux/libata.h2
-rw-r--r--include/linux/pwm.h2
-rw-r--r--include/linux/usb/wusb.h3
-rw-r--r--init/Kconfig8
-rw-r--r--kernel/power/disk.c4
-rw-r--r--kernel/trace/Kconfig9
-rw-r--r--kernel/trace/ftrace.c2
-rw-r--r--mm/page_alloc.c2
-rw-r--r--net/Kconfig2
-rw-r--r--net/ipv6/Kconfig18
-rw-r--r--net/mac80211/Kconfig2
-rw-r--r--net/netfilter/Kconfig2
-rw-r--r--net/phonet/Kconfig2
-rw-r--r--net/sunrpc/Kconfig2
-rw-r--r--net/wimax/Kconfig2
-rw-r--r--sound/oss/pss.c2
-rw-r--r--sound/sh/aica.c2
-rw-r--r--sound/soc/blackfin/Kconfig2
109 files changed, 226 insertions, 177 deletions
diff --git a/CREDITS b/CREDITS
index 9a93e3e26d70..2520ba620ff1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1412,8 +1412,8 @@ P: 1024D/77D4FC9B F5C5 1C20 1DFC DEC3 3107 54A4 2332 ADFC 77D4 FC9B
1412D: National Language Support 1412D: National Language Support
1413D: Linux Internationalization Project 1413D: Linux Internationalization Project
1414D: German Localization for Linux and GNU software 1414D: German Localization for Linux and GNU software
1415S: Kriemhildring 12a 1415S: Auf der Fittel 18
1416S: 65795 Hattersheim am Main 1416S: 53347 Alfter
1417S: Germany 1417S: Germany
1418 1418
1419N: Christoph Hellwig 1419N: Christoph Hellwig
@@ -3580,6 +3580,12 @@ N: Dirk Verworner
3580D: Co-author of German book ``Linux-Kernel-Programmierung'' 3580D: Co-author of German book ``Linux-Kernel-Programmierung''
3581D: Co-founder of Berlin Linux User Group 3581D: Co-founder of Berlin Linux User Group
3582 3582
3583N: Riku Voipio
3584E: riku.voipio@iki.fi
3585D: Author of PCA9532 LED and Fintek f75375s hwmon driver
3586D: Some random ARM board patches
3587S: Finland
3588
3583N: Patrick Volkerding 3589N: Patrick Volkerding
3584E: volkerdi@ftp.cdrom.com 3590E: volkerdi@ftp.cdrom.com
3585D: Produced the Slackware distribution, updated the SVGAlib 3591D: Produced the Slackware distribution, updated the SVGAlib
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 2a39aeba1464..d05737aaa84b 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -86,6 +86,8 @@ cachetlb.txt
86 - describes the cache/TLB flushing interfaces Linux uses. 86 - describes the cache/TLB flushing interfaces Linux uses.
87cdrom/ 87cdrom/
88 - directory with information on the CD-ROM drivers that Linux has. 88 - directory with information on the CD-ROM drivers that Linux has.
89cgroups/
90 - cgroups features, including cpusets and memory controller.
89connector/ 91connector/
90 - docs on the netlink based userspace<->kernel space communication mod. 92 - docs on the netlink based userspace<->kernel space communication mod.
91console/ 93console/
@@ -98,8 +100,6 @@ cpu-load.txt
98 - document describing how CPU load statistics are collected. 100 - document describing how CPU load statistics are collected.
99cpuidle/ 101cpuidle/
100 - info on CPU_IDLE, CPU idle state management subsystem. 102 - info on CPU_IDLE, CPU idle state management subsystem.
101cpusets.txt
102 - documents the cpusets feature; assign CPUs and Mem to a set of tasks.
103cputopology.txt 103cputopology.txt
104 - documentation on how CPU topology info is exported via sysfs. 104 - documentation on how CPU topology info is exported via sysfs.
105cris/ 105cris/
diff --git a/Documentation/cgroups/00-INDEX b/Documentation/cgroups/00-INDEX
new file mode 100644
index 000000000000..3f58fa3d6d00
--- /dev/null
+++ b/Documentation/cgroups/00-INDEX
@@ -0,0 +1,18 @@
100-INDEX
2 - this file
3cgroups.txt
4 - Control Groups definition, implementation details, examples and API.
5cpuacct.txt
6 - CPU Accounting Controller; account CPU usage for groups of tasks.
7cpusets.txt
8 - documents the cpusets feature; assign CPUs and Mem to a set of tasks.
9devices.txt
10 - Device Whitelist Controller; description, interface and security.
11freezer-subsystem.txt
12 - checkpointing; rationale to not use signals, interface.
13memcg_test.txt
14 - Memory Resource Controller; implementation details.
15memory.txt
16 - Memory Resource Controller; design, accounting, interface, testing.
17resource_counter.txt
18 - Resource Counter API.
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index 4ea852345a47..6eb1a97e88ce 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -56,7 +56,7 @@ hierarchy, and a set of subsystems; each subsystem has system-specific
56state attached to each cgroup in the hierarchy. Each hierarchy has 56state attached to each cgroup in the hierarchy. Each hierarchy has
57an instance of the cgroup virtual filesystem associated with it. 57an instance of the cgroup virtual filesystem associated with it.
58 58
59At any one time there may be multiple active hierachies of task 59At any one time there may be multiple active hierarchies of task
60cgroups. Each hierarchy is a partition of all tasks in the system. 60cgroups. Each hierarchy is a partition of all tasks in the system.
61 61
62User level code may create and destroy cgroups by name in an 62User level code may create and destroy cgroups by name in an
@@ -124,10 +124,10 @@ following lines:
124 / \ 124 / \
125 Prof (15%) students (5%) 125 Prof (15%) students (5%)
126 126
127Browsers like firefox/lynx go into the WWW network class, while (k)nfsd go 127Browsers like Firefox/Lynx go into the WWW network class, while (k)nfsd go
128into NFS network class. 128into NFS network class.
129 129
130At the same time firefox/lynx will share an appropriate CPU/Memory class 130At the same time Firefox/Lynx will share an appropriate CPU/Memory class
131depending on who launched it (prof/student). 131depending on who launched it (prof/student).
132 132
133With the ability to classify tasks differently for different resources 133With the ability to classify tasks differently for different resources
@@ -325,7 +325,7 @@ and then start a subshell 'sh' in that cgroup:
325Creating, modifying, using the cgroups can be done through the cgroup 325Creating, modifying, using the cgroups can be done through the cgroup
326virtual filesystem. 326virtual filesystem.
327 327
328To mount a cgroup hierarchy will all available subsystems, type: 328To mount a cgroup hierarchy with all available subsystems, type:
329# mount -t cgroup xxx /dev/cgroup 329# mount -t cgroup xxx /dev/cgroup
330 330
331The "xxx" is not interpreted by the cgroup code, but will appear in 331The "xxx" is not interpreted by the cgroup code, but will appear in
@@ -539,7 +539,7 @@ always handled well.
539void post_clone(struct cgroup_subsys *ss, struct cgroup *cgrp) 539void post_clone(struct cgroup_subsys *ss, struct cgroup *cgrp)
540(cgroup_mutex held by caller) 540(cgroup_mutex held by caller)
541 541
542Called at the end of cgroup_clone() to do any paramater 542Called at the end of cgroup_clone() to do any parameter
543initialization which might be required before a task could attach. For 543initialization which might be required before a task could attach. For
544example in cpusets, no task may attach before 'cpus' and 'mems' are set 544example in cpusets, no task may attach before 'cpus' and 'mems' are set
545up. 545up.
diff --git a/Documentation/cgroups/cpusets.txt b/Documentation/cgroups/cpusets.txt
index 0611e9528c7c..f9ca389dddf4 100644
--- a/Documentation/cgroups/cpusets.txt
+++ b/Documentation/cgroups/cpusets.txt
@@ -131,7 +131,7 @@ Cpusets extends these two mechanisms as follows:
131 - The hierarchy of cpusets can be mounted at /dev/cpuset, for 131 - The hierarchy of cpusets can be mounted at /dev/cpuset, for
132 browsing and manipulation from user space. 132 browsing and manipulation from user space.
133 - A cpuset may be marked exclusive, which ensures that no other 133 - A cpuset may be marked exclusive, which ensures that no other
134 cpuset (except direct ancestors and descendents) may contain 134 cpuset (except direct ancestors and descendants) may contain
135 any overlapping CPUs or Memory Nodes. 135 any overlapping CPUs or Memory Nodes.
136 - You can list all the tasks (by pid) attached to any cpuset. 136 - You can list all the tasks (by pid) attached to any cpuset.
137 137
@@ -226,7 +226,7 @@ nodes with memory--using the cpuset_track_online_nodes() hook.
226-------------------------------- 226--------------------------------
227 227
228If a cpuset is cpu or mem exclusive, no other cpuset, other than 228If a cpuset is cpu or mem exclusive, no other cpuset, other than
229a direct ancestor or descendent, may share any of the same CPUs or 229a direct ancestor or descendant, may share any of the same CPUs or
230Memory Nodes. 230Memory Nodes.
231 231
232A cpuset that is mem_exclusive *or* mem_hardwall is "hardwalled", 232A cpuset that is mem_exclusive *or* mem_hardwall is "hardwalled",
@@ -427,7 +427,7 @@ child cpusets have this flag enabled.
427When doing this, you don't usually want to leave any unpinned tasks in 427When doing this, you don't usually want to leave any unpinned tasks in
428the top cpuset that might use non-trivial amounts of CPU, as such tasks 428the top cpuset that might use non-trivial amounts of CPU, as such tasks
429may be artificially constrained to some subset of CPUs, depending on 429may be artificially constrained to some subset of CPUs, depending on
430the particulars of this flag setting in descendent cpusets. Even if 430the particulars of this flag setting in descendant cpusets. Even if
431such a task could use spare CPU cycles in some other CPUs, the kernel 431such a task could use spare CPU cycles in some other CPUs, the kernel
432scheduler might not consider the possibility of load balancing that 432scheduler might not consider the possibility of load balancing that
433task to that underused CPU. 433task to that underused CPU.
@@ -531,9 +531,9 @@ be idle.
531 531
532Of course it takes some searching cost to find movable tasks and/or 532Of course it takes some searching cost to find movable tasks and/or
533idle CPUs, the scheduler might not search all CPUs in the domain 533idle CPUs, the scheduler might not search all CPUs in the domain
534everytime. In fact, in some architectures, the searching ranges on 534every time. In fact, in some architectures, the searching ranges on
535events are limited in the same socket or node where the CPU locates, 535events are limited in the same socket or node where the CPU locates,
536while the load balance on tick searchs all. 536while the load balance on tick searches all.
537 537
538For example, assume CPU Z is relatively far from CPU X. Even if CPU Z 538For example, assume CPU Z is relatively far from CPU X. Even if CPU Z
539is idle while CPU X and the siblings are busy, scheduler can't migrate 539is idle while CPU X and the siblings are busy, scheduler can't migrate
@@ -601,7 +601,7 @@ its new cpuset, then the task will continue to use whatever subset
601of MPOL_BIND nodes are still allowed in the new cpuset. If the task 601of MPOL_BIND nodes are still allowed in the new cpuset. If the task
602was using MPOL_BIND and now none of its MPOL_BIND nodes are allowed 602was using MPOL_BIND and now none of its MPOL_BIND nodes are allowed
603in the new cpuset, then the task will be essentially treated as if it 603in the new cpuset, then the task will be essentially treated as if it
604was MPOL_BIND bound to the new cpuset (even though its numa placement, 604was MPOL_BIND bound to the new cpuset (even though its NUMA placement,
605as queried by get_mempolicy(), doesn't change). If a task is moved 605as queried by get_mempolicy(), doesn't change). If a task is moved
606from one cpuset to another, then the kernel will adjust the tasks 606from one cpuset to another, then the kernel will adjust the tasks
607memory placement, as above, the next time that the kernel attempts 607memory placement, as above, the next time that the kernel attempts
diff --git a/Documentation/cgroups/devices.txt b/Documentation/cgroups/devices.txt
index 7cc6e6a60672..57ca4c89fe5c 100644
--- a/Documentation/cgroups/devices.txt
+++ b/Documentation/cgroups/devices.txt
@@ -42,7 +42,7 @@ suffice, but we can decide the best way to adequately restrict
42movement as people get some experience with this. We may just want 42movement as people get some experience with this. We may just want
43to require CAP_SYS_ADMIN, which at least is a separate bit from 43to require CAP_SYS_ADMIN, which at least is a separate bit from
44CAP_MKNOD. We may want to just refuse moving to a cgroup which 44CAP_MKNOD. We may want to just refuse moving to a cgroup which
45isn't a descendent of the current one. Or we may want to use 45isn't a descendant of the current one. Or we may want to use
46CAP_MAC_ADMIN, since we really are trying to lock down root. 46CAP_MAC_ADMIN, since we really are trying to lock down root.
47 47
48CAP_SYS_ADMIN is needed to modify the whitelist or move another 48CAP_SYS_ADMIN is needed to modify the whitelist or move another
diff --git a/Documentation/cgroups/memcg_test.txt b/Documentation/cgroups/memcg_test.txt
index 8a11caf417a0..72db89ed0609 100644
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
@@ -356,7 +356,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
356 (Shell-B) 356 (Shell-B)
357 # move all tasks in /cgroup/test to /cgroup 357 # move all tasks in /cgroup/test to /cgroup
358 # /sbin/swapoff -a 358 # /sbin/swapoff -a
359 # rmdir /test/cgroup 359 # rmdir /cgroup/test
360 # kill malloc task. 360 # kill malloc task.
361 361
362 Of course, tmpfs v.s. swapoff test should be tested, too. 362 Of course, tmpfs v.s. swapoff test should be tested, too.
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index e1501964df1e..a98a7fe7aabb 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -302,7 +302,7 @@ will be charged as a new owner of it.
302 unevictable - # of pages cannot be reclaimed.(mlocked etc) 302 unevictable - # of pages cannot be reclaimed.(mlocked etc)
303 303
304 Below is depend on CONFIG_DEBUG_VM. 304 Below is depend on CONFIG_DEBUG_VM.
305 inactive_ratio - VM inernal parameter. (see mm/page_alloc.c) 305 inactive_ratio - VM internal parameter. (see mm/page_alloc.c)
306 recent_rotated_anon - VM internal parameter. (see mm/vmscan.c) 306 recent_rotated_anon - VM internal parameter. (see mm/vmscan.c)
307 recent_rotated_file - VM internal parameter. (see mm/vmscan.c) 307 recent_rotated_file - VM internal parameter. (see mm/vmscan.c)
308 recent_scanned_anon - VM internal parameter. (see mm/vmscan.c) 308 recent_scanned_anon - VM internal parameter. (see mm/vmscan.c)
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index e5f3833a6ef8..570f9bd9be2b 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -14,6 +14,11 @@ Options
14When mounting an ext3 filesystem, the following option are accepted: 14When mounting an ext3 filesystem, the following option are accepted:
15(*) == default 15(*) == default
16 16
17ro Mount filesystem read only. Note that ext3 will replay
18 the journal (and thus write to the partition) even when
19 mounted "read only". Mount options "ro,noload" can be
20 used to prevent writes to the filesystem.
21
17journal=update Update the ext3 file system's journal to the current 22journal=update Update the ext3 file system's journal to the current
18 format. 23 format.
19 24
@@ -27,7 +32,9 @@ journal_dev=devnum When the external journal device's major/minor numbers
27 identified through its new major/minor numbers encoded 32 identified through its new major/minor numbers encoded
28 in devnum. 33 in devnum.
29 34
30noload Don't load the journal on mounting. 35noload Don't load the journal on mounting. Note that this forces
36 mount of inconsistent filesystem, which can lead to
37 various problems.
31 38
32data=journal All data are committed into the journal prior to being 39data=journal All data are committed into the journal prior to being
33 written into the main file system. 40 written into the main file system.
@@ -92,9 +99,12 @@ nocheck
92 99
93debug Extra debugging information is sent to syslog. 100debug Extra debugging information is sent to syslog.
94 101
95errors=remount-ro(*) Remount the filesystem read-only on an error. 102errors=remount-ro Remount the filesystem read-only on an error.
96errors=continue Keep going on a filesystem error. 103errors=continue Keep going on a filesystem error.
97errors=panic Panic and halt the machine if an error occurs. 104errors=panic Panic and halt the machine if an error occurs.
105 (These mount options override the errors behavior
106 specified in the superblock, which can be
107 configured using tune2fs.)
98 108
99data_err=ignore(*) Just print an error message if an error occurs 109data_err=ignore(*) Just print an error message if an error occurs
100 in a file data buffer in ordered mode. 110 in a file data buffer in ordered mode.
diff --git a/Documentation/ia64/kvm.txt b/Documentation/ia64/kvm.txt
index 84f7cb3d5bec..ffb5c80bec3e 100644
--- a/Documentation/ia64/kvm.txt
+++ b/Documentation/ia64/kvm.txt
@@ -42,7 +42,7 @@ Note: For step 2, please make sure that host page size == TARGET_PAGE_SIZE of qe
42 hg clone http://xenbits.xensource.com/ext/efi-vfirmware.hg 42 hg clone http://xenbits.xensource.com/ext/efi-vfirmware.hg
43 you can get the firmware's binary in the directory of efi-vfirmware.hg/binaries. 43 you can get the firmware's binary in the directory of efi-vfirmware.hg/binaries.
44 44
45 (3) Rename the firware you owned to Flash.fd, and copy it to /usr/local/share/qemu 45 (3) Rename the firmware you owned to Flash.fd, and copy it to /usr/local/share/qemu
46 46
474. Boot up Linux or Windows guests: 474. Boot up Linux or Windows guests:
48 4.1 Create or install a image for guest boot. If you have xen experience, it should be easy. 48 4.1 Create or install a image for guest boot. If you have xen experience, it should be easy.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index bdc0c433e88c..421920897a37 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1605,7 +1605,7 @@ and is between 256 and 4096 characters. It is defined in the file
1605 nosoftlockup [KNL] Disable the soft-lockup detector. 1605 nosoftlockup [KNL] Disable the soft-lockup detector.
1606 1606
1607 noswapaccount [KNL] Disable accounting of swap in memory resource 1607 noswapaccount [KNL] Disable accounting of swap in memory resource
1608 controller. (See Documentation/controllers/memory.txt) 1608 controller. (See Documentation/cgroups/memory.txt)
1609 1609
1610 nosync [HW,M68K] Disables sync negotiation for all devices. 1610 nosync [HW,M68K] Disables sync negotiation for all devices.
1611 1611
@@ -1955,7 +1955,7 @@ and is between 256 and 4096 characters. It is defined in the file
1955 1955
1956 relax_domain_level= 1956 relax_domain_level=
1957 [KNL, SMP] Set scheduler's default relax_domain_level. 1957 [KNL, SMP] Set scheduler's default relax_domain_level.
1958 See Documentation/cpusets.txt. 1958 See Documentation/cgroups/cpusets.txt.
1959 1959
1960 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area 1960 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1961 1961
diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
index 6c238f59b2a9..249db3a15d15 100644
--- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
@@ -1,6 +1,6 @@
1* Uploaded QE firmware 1* Uploaded QE firmware
2 2
3 If a new firwmare has been uploaded to the QE (usually by the 3 If a new firmware has been uploaded to the QE (usually by the
4 boot loader), then a 'firmware' child node should be added to the QE 4 boot loader), then a 'firmware' child node should be added to the QE
5 node. This node provides information on the uploaded firmware that 5 node. This node provides information on the uploaded firmware that
6 device drivers may need. 6 device drivers may need.
diff --git a/Documentation/scheduler/sched-rt-group.txt b/Documentation/scheduler/sched-rt-group.txt
index 3ef339f491e0..5ba4d3fc625a 100644
--- a/Documentation/scheduler/sched-rt-group.txt
+++ b/Documentation/scheduler/sched-rt-group.txt
@@ -126,7 +126,7 @@ This uses the /cgroup virtual file system and "/cgroup/<cgroup>/cpu.rt_runtime_u
126to control the CPU time reserved for each control group instead. 126to control the CPU time reserved for each control group instead.
127 127
128For more information on working with control groups, you should read 128For more information on working with control groups, you should read
129Documentation/cgroups.txt as well. 129Documentation/cgroups/cgroups.txt as well.
130 130
131Group settings are checked against the following limits in order to keep the configuration 131Group settings are checked against the following limits in order to keep the configuration
132schedulable: 132schedulable:
diff --git a/Documentation/vm/numa_memory_policy.txt b/Documentation/vm/numa_memory_policy.txt
index 6aaaeb38730c..be45dbb9d7f2 100644
--- a/Documentation/vm/numa_memory_policy.txt
+++ b/Documentation/vm/numa_memory_policy.txt
@@ -8,7 +8,8 @@ The current memory policy support was added to Linux 2.6 around May 2004. This
8document attempts to describe the concepts and APIs of the 2.6 memory policy 8document attempts to describe the concepts and APIs of the 2.6 memory policy
9support. 9support.
10 10
11Memory policies should not be confused with cpusets (Documentation/cpusets.txt) 11Memory policies should not be confused with cpusets
12(Documentation/cgroups/cpusets.txt)
12which is an administrative mechanism for restricting the nodes from which 13which is an administrative mechanism for restricting the nodes from which
13memory may be allocated by a set of processes. Memory policies are a 14memory may be allocated by a set of processes. Memory policies are a
14programming interface that a NUMA-aware application can take advantage of. When 15programming interface that a NUMA-aware application can take advantage of. When
diff --git a/Documentation/vm/page_migration b/Documentation/vm/page_migration
index d5fdfd34bbaf..6513fe2d90b8 100644
--- a/Documentation/vm/page_migration
+++ b/Documentation/vm/page_migration
@@ -37,7 +37,8 @@ locations.
37 37
38Larger installations usually partition the system using cpusets into 38Larger installations usually partition the system using cpusets into
39sections of nodes. Paul Jackson has equipped cpusets with the ability to 39sections of nodes. Paul Jackson has equipped cpusets with the ability to
40move pages when a task is moved to another cpuset (See ../cpusets.txt). 40move pages when a task is moved to another cpuset (See
41Documentation/cgroups/cpusets.txt).
41Cpusets allows the automation of process locality. If a task is moved to 42Cpusets allows the automation of process locality. If a task is moved to
42a new cpuset then also all its pages are moved with it so that the 43a new cpuset then also all its pages are moved with it so that the
43performance of the process does not sink dramatically. Also the pages 44performance of the process does not sink dramatically. Also the pages
diff --git a/Documentation/x86/x86_64/fake-numa-for-cpusets b/Documentation/x86/x86_64/fake-numa-for-cpusets
index 33bb56655991..0f11d9becb0b 100644
--- a/Documentation/x86/x86_64/fake-numa-for-cpusets
+++ b/Documentation/x86/x86_64/fake-numa-for-cpusets
@@ -7,7 +7,8 @@ you can create fake NUMA nodes that represent contiguous chunks of memory and
7assign them to cpusets and their attached tasks. This is a way of limiting the 7assign them to cpusets and their attached tasks. This is a way of limiting the
8amount of system memory that are available to a certain class of tasks. 8amount of system memory that are available to a certain class of tasks.
9 9
10For more information on the features of cpusets, see Documentation/cpusets.txt. 10For more information on the features of cpusets, see
11Documentation/cgroups/cpusets.txt.
11There are a number of different configurations you can use for your needs. For 12There are a number of different configurations you can use for your needs. For
12more information on the numa=fake command line option and its various ways of 13more information on the numa=fake command line option and its various ways of
13configuring fake nodes, see Documentation/x86/x86_64/boot-options.txt. 14configuring fake nodes, see Documentation/x86/x86_64/boot-options.txt.
@@ -32,7 +33,7 @@ A machine may be split as follows with "numa=fake=4*512," as reported by dmesg:
32 On node 3 totalpages: 131072 33 On node 3 totalpages: 131072
33 34
34Now following the instructions for mounting the cpusets filesystem from 35Now following the instructions for mounting the cpusets filesystem from
35Documentation/cpusets.txt, you can assign fake nodes (i.e. contiguous memory 36Documentation/cgroups/cpusets.txt, you can assign fake nodes (i.e. contiguous memory
36address spaces) to individual cpusets: 37address spaces) to individual cpusets:
37 38
38 [root@xroads /]# mkdir exampleset 39 [root@xroads /]# mkdir exampleset
diff --git a/MAINTAINERS b/MAINTAINERS
index 6fe6f39a3d31..6360b9b9bbbd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1763,6 +1763,12 @@ M: viro@zeniv.linux.org.uk
1763L: linux-fsdevel@vger.kernel.org 1763L: linux-fsdevel@vger.kernel.org
1764S: Maintained 1764S: Maintained
1765 1765
1766FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
1767P: Riku Voipio
1768M: riku.vipio@iki.fi
1769L: lm-sensors@lm-sensors.org
1770S: Maintained
1771
1766FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>) 1772FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
1767P: Kristian Hoegsberg, Stefan Richter 1773P: Kristian Hoegsberg, Stefan Richter
1768M: krh@redhat.com, stefanr@s5r6.in-berlin.de 1774M: krh@redhat.com, stefanr@s5r6.in-berlin.de
@@ -3408,6 +3414,11 @@ P: Jim Cromie
3408M: jim.cromie@gmail.com 3414M: jim.cromie@gmail.com
3409S: Maintained 3415S: Maintained
3410 3416
3417PCA9532 LED DRIVER
3418P: Riku Voipio
3419M: riku.voipio@iki.fi
3420S: Maintained
3421
3411PCI ERROR RECOVERY 3422PCI ERROR RECOVERY
3412P: Linas Vepstas 3423P: Linas Vepstas
3413M: linas@austin.ibm.com 3424M: linas@austin.ibm.com
diff --git a/arch/arm/mach-netx/include/mach/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h
index 08c60ff227be..5a03e7ccb01a 100644
--- a/arch/arm/mach-netx/include/mach/netx-regs.h
+++ b/arch/arm/mach-netx/include/mach/netx-regs.h
@@ -80,7 +80,7 @@
80#define NETX_PA_XPEC(no) (NETX_IO_PHYS + NETX_OFS_XPEC(no)) 80#define NETX_PA_XPEC(no) (NETX_IO_PHYS + NETX_OFS_XPEC(no))
81#define NETX_PA_VIC (NETX_IO_PHYS + NETX_OFS_VIC) 81#define NETX_PA_VIC (NETX_IO_PHYS + NETX_OFS_VIC)
82 82
83/* virual addresses */ 83/* virtual addresses */
84#define NETX_VA_SYSTEM (NETX_IO_VIRT + NETX_OFS_SYSTEM) 84#define NETX_VA_SYSTEM (NETX_IO_VIRT + NETX_OFS_SYSTEM)
85#define NETX_VA_MEMCR (NETX_IO_VIRT + NETX_OFS_MEMCR) 85#define NETX_VA_MEMCR (NETX_IO_VIRT + NETX_OFS_MEMCR)
86#define NETX_VA_DPMAS (NETX_IO_VIRT + NETX_OFS_DPMAS) 86#define NETX_VA_DPMAS (NETX_IO_VIRT + NETX_OFS_DPMAS)
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 3f325d3718a9..cd8de89c5fad 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -109,7 +109,7 @@ config MACH_OMAP_PALMZ71
109 help 109 help
110 Support for the Palm Zire71 PDA. To boot the kernel, 110 Support for the Palm Zire71 PDA. To boot the kernel,
111 you'll need a PalmOS compatible bootloader; check out 111 you'll need a PalmOS compatible bootloader; check out
112 http://hackndev.com/palm/z71 for more informations. 112 http://hackndev.com/palm/z71 for more information.
113 Say Y here if you have such a PDA, say N otherwise. 113 Say Y here if you have such a PDA, say N otherwise.
114 114
115config MACH_OMAP_PALMTT 115config MACH_OMAP_PALMTT
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 05fe3053dcae..414a8ad97f52 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -127,13 +127,13 @@ config BOARD_HAMMERHEAD
127 select CPU_AT32AP7000 127 select CPU_AT32AP7000
128 select USB_ARCH_HAS_HCD 128 select USB_ARCH_HAS_HCD
129 help 129 help
130 The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel. 130 The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel.
131 It offers versatile peripherals, such as ethernet, usb device, usb host etc. 131 It offers versatile peripherals, such as ethernet, usb device, usb host etc.
132 132
133 The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered 133 The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered
134 Device (PD). 134 Device (PD).
135 135
136 Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is 136 Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
137 mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which 137 mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which
138 will cover even the most exceptional need of memory bandwidth. Together with the onboard 138 will cover even the most exceptional need of memory bandwidth. Together with the onboard
139 video decoder the board is ready for video processing. 139 video decoder the board is ready for video processing.
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 0c1f86e3e44a..3640cdc38aac 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -777,7 +777,7 @@ config CACHELINE_ALIGNED_L1
777 default n if BF54x 777 default n if BF54x
778 depends on !BF531 778 depends on !BF531
779 help 779 help
780 If enabled, cacheline_anligned data is linked 780 If enabled, cacheline_aligned data is linked
781 into L1 data memory. (less latency) 781 into L1 data memory. (less latency)
782 782
783config SYSCALL_TAB_L1 783config SYSCALL_TAB_L1
@@ -957,7 +957,7 @@ config MPU
957 memory they do not own. This comes at a performance penalty 957 memory they do not own. This comes at a performance penalty
958 and is recommended only for debugging. 958 and is recommended only for debugging.
959 959
960comment "Asynchonous Memory Configuration" 960comment "Asynchronous Memory Configuration"
961 961
962menu "EBIU_AMGCTL Global Control" 962menu "EBIU_AMGCTL Global Control"
963config C_AMCKEN 963config C_AMCKEN
@@ -989,7 +989,7 @@ config C_B3PEN
989 default n 989 default n
990 990
991choice 991choice
992 prompt"Enable Asynchonous Memory Banks" 992 prompt "Enable Asynchronous Memory Banks"
993 default C_AMBEN_ALL 993 default C_AMBEN_ALL
994 994
995config C_AMBEN 995config C_AMBEN
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 3462245fe9fb..7adac388a771 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -438,7 +438,7 @@ config ETRAX_SERIAL_PORT0_DMA1_IN
438 help 438 help
439 Enables the DMA1 input channel for ser0 (ttyS0). 439 Enables the DMA1 input channel for ser0 (ttyS0).
440 If you do not enable DMA, an interrupt for each character will be 440 If you do not enable DMA, an interrupt for each character will be
441 used when receiveing data. 441 used when receiving data.
442 Normally you want to use DMA, unless you use the DMA channel for 442 Normally you want to use DMA, unless you use the DMA channel for
443 something else. 443 something else.
444 444
@@ -565,7 +565,7 @@ config ETRAX_SERIAL_PORT2_DMA7_IN
565 help 565 help
566 Enables the DMA7 input channel for ser2 (ttyS2). 566 Enables the DMA7 input channel for ser2 (ttyS2).
567 If you do not enable DMA, an interrupt for each character will be 567 If you do not enable DMA, an interrupt for each character will be
568 used when receiveing data. 568 used when receiving data.
569 Normally you want to use DMA, unless you use the DMA channel for 569 Normally you want to use DMA, unless you use the DMA channel for
570 something else. 570 something else.
571 571
@@ -604,7 +604,7 @@ config ETRAX_SERIAL_PORT3_DMA3_IN
604 help 604 help
605 Enables the DMA3 input channel for ser3 (ttyS3). 605 Enables the DMA3 input channel for ser3 (ttyS3).
606 If you do not enable DMA, an interrupt for each character will be 606 If you do not enable DMA, an interrupt for each character will be
607 used when receiveing data. 607 used when receiving data.
608 Normally you want to use DMA, unless you use the DMA channel for 608 Normally you want to use DMA, unless you use the DMA channel for
609 something else. 609 something else.
610 610
diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig
index 005ed2b3f7f4..21bbd93be34f 100644
--- a/arch/cris/arch-v32/Kconfig
+++ b/arch/cris/arch-v32/Kconfig
@@ -28,7 +28,7 @@ config ETRAX_NBR_LED_GRP_ONE
28 help 28 help
29 Select this if you want one Ethernet LED group. This LED group 29 Select this if you want one Ethernet LED group. This LED group
30 can be used for one or more Ethernet interfaces. However, it is 30 can be used for one or more Ethernet interfaces. However, it is
31 recomended that each Ethernet interface use a dedicated LED group. 31 recommended that each Ethernet interface use a dedicated LED group.
32 32
33config ETRAX_NBR_LED_GRP_TWO 33config ETRAX_NBR_LED_GRP_TWO
34 bool "Use two LED groups" 34 bool "Use two LED groups"
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 7a64fcef9d07..b9e328e688be 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -342,7 +342,7 @@ config ETRAX_SERIAL_PORT4_DMA9_IN
342 help 342 help
343 Enables the DMA9 input channel for ser4 (ttyS4). 343 Enables the DMA9 input channel for ser4 (ttyS4).
344 If you do not enable DMA, an interrupt for each character will be 344 If you do not enable DMA, an interrupt for each character will be
345 used when receiveing data. 345 used when receiving data.
346 Normally you want to use DMA, unless you use the DMA channel for 346 Normally you want to use DMA, unless you use the DMA channel for
347 something else. 347 something else.
348 348
diff --git a/arch/cris/arch-v32/mach-fs/Kconfig b/arch/cris/arch-v32/mach-fs/Kconfig
index f6d74475f1c6..774de82abef6 100644
--- a/arch/cris/arch-v32/mach-fs/Kconfig
+++ b/arch/cris/arch-v32/mach-fs/Kconfig
@@ -59,7 +59,7 @@ config ETRAX_SDRAM_GRP1_CONFIG
59 depends on ETRAX_ARCH_V32 59 depends on ETRAX_ARCH_V32
60 default "0" 60 default "0"
61 help 61 help
62 SDRAM configuration for group 1. The defult value is 0 62 SDRAM configuration for group 1. The default value is 0
63 because group 1 is not used in the default configuration, 63 because group 1 is not used in the default configuration,
64 described in the help for SDRAM_GRP0_CONFIG. 64 described in the help for SDRAM_GRP0_CONFIG.
65 65
diff --git a/arch/h8300/kernel/timer/tpu.c b/arch/h8300/kernel/timer/tpu.c
index ad383caae196..e7c6e614a758 100644
--- a/arch/h8300/kernel/timer/tpu.c
+++ b/arch/h8300/kernel/timer/tpu.c
@@ -67,7 +67,7 @@ static struct irqaction tpu_irq = {
67 .flags = IRQF_DISABLED | IRQF_TIMER, 67 .flags = IRQF_DISABLED | IRQF_TIMER,
68}; 68};
69 69
70const static int __initdata divide_rate[] = { 70static const int __initdata divide_rate[] = {
71#if CONFIG_H8300_TPU_CH == 0 71#if CONFIG_H8300_TPU_CH == 0
72 1,4,16,64,0,0,0,0, 72 1,4,16,64,0,0,0,0,
73#elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5) 73#elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index dc787190430a..998e5db8cc0f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -134,7 +134,7 @@ config MACH_JAZZ
134 help 134 help
135 This a family of machines based on the MIPS R4030 chipset which was 135 This a family of machines based on the MIPS R4030 chipset which was
136 used by several vendors to build RISC/os and Windows NT workstations. 136 used by several vendors to build RISC/os and Windows NT workstations.
137 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and 137 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
138 Olivetti M700-10 workstations. 138 Olivetti M700-10 workstations.
139 139
140config LASAT 140config LASAT
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 5b47d6b65275..cbcd7eb83bd1 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -221,7 +221,7 @@ static void __init ip27_smp_setup(void)
221 * Assumption to be fixed: we're always booted on logical / physical 221 * Assumption to be fixed: we're always booted on logical / physical
222 * processor 0. While we're always running on logical processor 0 222 * processor 0. While we're always running on logical processor 0
223 * this still means this is physical processor zero; it might for 223 * this still means this is physical processor zero; it might for
224 * example be disabled in the firwware. 224 * example be disabled in the firmware.
225 */ 225 */
226 alloc_cpupda(0, 0); 226 alloc_cpupda(0, 0);
227} 227}
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 45192dce65c4..9e08d8a69fdf 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -346,7 +346,7 @@ config PHYP_DUMP
346 help 346 help
347 Hypervisor-assisted dump is meant to be a kdump replacement 347 Hypervisor-assisted dump is meant to be a kdump replacement
348 offering robustness and speed not possible without system 348 offering robustness and speed not possible without system
349 hypervisor assistence. 349 hypervisor assistance.
350 350
351 If unsure, say "N" 351 If unsure, say "N"
352 352
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index ffa2a9fd53d0..e3e87078d03f 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -293,7 +293,7 @@ config CPM
293config OF_RTC 293config OF_RTC
294 bool 294 bool
295 help 295 help
296 Uses information from the OF or flattened device tree to instatiate 296 Uses information from the OF or flattened device tree to instantiate
297 platform devices for direct mapped RTC chips like the DS1742 or DS1743. 297 platform devices for direct mapped RTC chips like the DS1742 or DS1743.
298 298
299source "arch/powerpc/sysdev/bestcomm/Kconfig" 299source "arch/powerpc/sysdev/bestcomm/Kconfig"
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig
index 0b192a1c429d..29e427085efb 100644
--- a/arch/powerpc/sysdev/bestcomm/Kconfig
+++ b/arch/powerpc/sysdev/bestcomm/Kconfig
@@ -9,8 +9,8 @@ config PPC_BESTCOMM
9 select PPC_LIB_RHEAP 9 select PPC_LIB_RHEAP
10 help 10 help
11 BestComm is the name of the communication coprocessor found 11 BestComm is the name of the communication coprocessor found
12 on the Freescale MPC5200 family of processor. It's usage is 12 on the Freescale MPC5200 family of processor. Its usage is
13 optionnal for some drivers (like ATA), but required for 13 optional for some drivers (like ATA), but required for
14 others (like FEC). 14 others (like FEC).
15 15
16 If you want to use drivers that require DMA operations, 16 If you want to use drivers that require DMA operations,
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 8d50d527c595..2d52b515c241 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -640,10 +640,10 @@ config GUSA_RB
640 depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A) 640 depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A)
641 help 641 help
642 Enabling this option will allow the kernel to implement some 642 Enabling this option will allow the kernel to implement some
643 atomic operations using a software implemention of load-locked/ 643 atomic operations using a software implementation of load-locked/
644 store-conditional (LLSC). On machines which do not have hardware 644 store-conditional (LLSC). On machines which do not have hardware
645 LLSC, this should be more efficient than the other alternative of 645 LLSC, this should be more efficient than the other alternative of
646 disabling insterrupts around the atomic sequence. 646 disabling interrupts around the atomic sequence.
647 647
648endmenu 648endmenu
649 649
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index a46c3a21e26d..3a1b7bf03cff 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -686,7 +686,7 @@ tlb_fixup_done:
686 * point. 686 * point.
687 * 687 *
688 * There used to be enormous complexity wrt. transferring 688 * There used to be enormous complexity wrt. transferring
689 * over from the firwmare's trap table to the Linux kernel's. 689 * over from the firmware's trap table to the Linux kernel's.
690 * For example, there was a chicken & egg problem wrt. building 690 * For example, there was a chicken & egg problem wrt. building
691 * the OBP page tables, yet needing to be on the Linux kernel 691 * the OBP page tables, yet needing to be on the Linux kernel
692 * trap table (to translate PAGE_OFFSET addresses) in order to 692 * trap table (to translate PAGE_OFFSET addresses) in order to
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3f27e5c0c9c9..5696cec7b4b0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1144,7 +1144,7 @@ config NODES_SHIFT
1144 depends on NEED_MULTIPLE_NODES 1144 depends on NEED_MULTIPLE_NODES
1145 ---help--- 1145 ---help---
1146 Specify the maximum number of NUMA Nodes available on the target 1146 Specify the maximum number of NUMA Nodes available on the target
1147 system. Increases memory reserved to accomodate various tables. 1147 system. Increases memory reserved to accommodate various tables.
1148 1148
1149config HAVE_ARCH_BOOTMEM 1149config HAVE_ARCH_BOOTMEM
1150 def_bool y 1150 def_bool y
@@ -1322,7 +1322,7 @@ config MTRR_SANITIZER
1322 add writeback entries. 1322 add writeback entries.
1323 1323
1324 Can be disabled with disable_mtrr_cleanup on the kernel command line. 1324 Can be disabled with disable_mtrr_cleanup on the kernel command line.
1325 The largest mtrr entry size for a continous block can be set with 1325 The largest mtrr entry size for a continuous block can be set with
1326 mtrr_chunk_size. 1326 mtrr_chunk_size.
1327 1327
1328 If unsure, say Y. 1328 If unsure, say Y.
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index c11f9aeca706..1ba9d61ea69a 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -367,7 +367,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
367 /* 367 /*
368 * Treat freezing temperatures as invalid as well; some 368 * Treat freezing temperatures as invalid as well; some
369 * BIOSes return really low values and cause reboots at startup. 369 * BIOSes return really low values and cause reboots at startup.
370 * Below zero (Celcius) values clearly aren't right for sure.. 370 * Below zero (Celsius) values clearly aren't right for sure..
371 * ... so lets discard those as invalid. 371 * ... so lets discard those as invalid.
372 */ 372 */
373 if (ACPI_FAILURE(status) || 373 if (ACPI_FAILURE(status) ||
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 0bcf26464670..9120717c0701 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -86,7 +86,7 @@ config ATA_SFF
86 86
87 For users with exclusively modern controllers like AHCI, 87 For users with exclusively modern controllers like AHCI,
88 Silicon Image 3124, or Marvell 6440, you may choose to 88 Silicon Image 3124, or Marvell 6440, you may choose to
89 disable this uneeded SFF support. 89 disable this unneeded SFF support.
90 90
91 If unsure, say Y. 91 If unsure, say Y.
92 92
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 76ce75bad91e..3236b434b964 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -300,7 +300,7 @@ void sysdev_unregister(struct sys_device *sysdev)
300 * and the class driver. 300 * and the class driver.
301 * 301 *
302 * Note: The list is iterated in reverse order, so that we shut down 302 * Note: The list is iterated in reverse order, so that we shut down
303 * child devices before we shut down thier parents. The list ordering 303 * child devices before we shut down their parents. The list ordering
304 * is guaranteed by virtue of the fact that child devices are registered 304 * is guaranteed by virtue of the fact that child devices are registered
305 * after their parents. 305 * after their parents.
306 */ 306 */
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index f6094ae0ef33..140ea10ecb88 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -140,7 +140,7 @@ static int bsr_open(struct inode * inode, struct file * filp)
140 return 0; 140 return 0;
141} 141}
142 142
143const static struct file_operations bsr_fops = { 143static const struct file_operations bsr_fops = {
144 .owner = THIS_MODULE, 144 .owner = THIS_MODULE,
145 .mmap = bsr_mmap, 145 .mmap = bsr_mmap,
146 .open = bsr_open, 146 .open = bsr_open,
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3d2565441b36..edb02530e461 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -42,9 +42,9 @@ config DEBUG_GPIO
42 depends on DEBUG_KERNEL 42 depends on DEBUG_KERNEL
43 help 43 help
44 Say Y here to add some extra checks and diagnostics to GPIO calls. 44 Say Y here to add some extra checks and diagnostics to GPIO calls.
45 The checks help ensure that GPIOs have been properly initialized 45 These checks help ensure that GPIOs have been properly initialized
46 before they are used and that sleeping calls aren not made from 46 before they are used, and that sleeping calls are not made from
47 nonsleeping contexts. They can make bitbanged serial protocols 47 non-sleeping contexts. They can make bitbanged serial protocols
48 slower. The diagnostics help catch the type of setup errors 48 slower. The diagnostics help catch the type of setup errors
49 that are most common when setting up new platforms or boards. 49 that are most common when setting up new platforms or boards.
50 50
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e85c8fe9ffcf..504cfaa6160f 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -243,7 +243,7 @@ config GREENASIA_FF
243 select INPUT_FF_MEMLESS 243 select INPUT_FF_MEMLESS
244 ---help--- 244 ---help---
245 Say Y here if you have a GreenAsia (Product ID 0x12) based game controller 245 Say Y here if you have a GreenAsia (Product ID 0x12) based game controller
246 (like MANTA Warior MM816 and SpeedLink Strike2 SL-6635) or adapter 246 (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
247 and want to enable force feedback support for it. 247 and want to enable force feedback support for it.
248 248
249config HID_TOPSEED 249config HID_TOPSEED
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index 18a1ba888165..e2107e533ede 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * f75375s.c - driver for the Fintek F75375/SP and F75373 2 * f75375s.c - driver for the Fintek F75375/SP and F75373
3 * hardware monitoring features 3 * hardware monitoring features
4 * Copyright (C) 2006-2007 Riku Voipio <riku.voipio@movial.fi> 4 * Copyright (C) 2006-2007 Riku Voipio
5 * 5 *
6 * Datasheets available at: 6 * Datasheets available at:
7 * 7 *
@@ -721,7 +721,7 @@ static void __exit sensors_f75375_exit(void)
721 i2c_del_driver(&f75375_driver); 721 i2c_del_driver(&f75375_driver);
722} 722}
723 723
724MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>"); 724MODULE_AUTHOR("Riku Voipio");
725MODULE_LICENSE("GPL"); 725MODULE_LICENSE("GPL");
726MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver"); 726MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver");
727 727
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 5f9d860925a1..cd50c00ab20f 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -143,7 +143,7 @@ config INPUT_APMPOWER
143 ---help--- 143 ---help---
144 Say Y here if you want suspend key events to trigger a user 144 Say Y here if you want suspend key events to trigger a user
145 requested suspend through APM. This is useful on embedded 145 requested suspend through APM. This is useful on embedded
146 systems where such behviour is desired without userspace 146 systems where such behaviour is desired without userspace
147 interaction. If unsure, say N. 147 interaction. If unsure, say N.
148 148
149 To compile this driver as a module, choose M here: the 149 To compile this driver as a module, choose M here: the
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 0db8d16c5edd..5e5eb88d8d1e 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -18,7 +18,7 @@
18 18
19/* 19/*
20 * Timer function which is run every scan_ms ms when the device is opened. 20 * Timer function which is run every scan_ms ms when the device is opened.
21 * The dev input varaible is set to the the input_dev pointer. 21 * The dev input variable is set to the the input_dev pointer.
22 */ 22 */
23static void gpio_mouse_scan(struct input_polled_dev *dev) 23static void gpio_mouse_scan(struct input_polled_dev *dev)
24{ 24{
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 7c27c8b9b6d0..056ac77e2cf0 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -295,7 +295,7 @@ name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
295static DEVICE_ATTR(name, S_IRUGO, name ## _show, NULL); 295static DEVICE_ATTR(name, S_IRUGO, name ## _show, NULL);
296 296
297 297
298/* Sysfs conventions report temperatures in millidegrees Celcius. 298/* Sysfs conventions report temperatures in millidegrees Celsius.
299 * ADS7846 could use the low-accuracy two-sample scheme, but can't do the high 299 * ADS7846 could use the low-accuracy two-sample scheme, but can't do the high
300 * accuracy scheme without calibration data. For now we won't try either; 300 * accuracy scheme without calibration data. For now we won't try either;
301 * userspace sees raw sensor values, and must scale/calibrate appropriately. 301 * userspace sees raw sensor values, and must scale/calibrate appropriately.
diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig
index 4938355c4072..1747a02a019a 100644
--- a/drivers/isdn/mISDN/Kconfig
+++ b/drivers/isdn/mISDN/Kconfig
@@ -14,13 +14,15 @@ config MISDN_DSP
14 depends on MISDN 14 depends on MISDN
15 help 15 help
16 Enable support for digital audio processing capability. 16 Enable support for digital audio processing capability.
17
17 This module may be used for special applications that require 18 This module may be used for special applications that require
18 cross connecting of bchannels, conferencing, dtmf decoding 19 cross connecting of bchannels, conferencing, dtmf decoding,
19 echo cancelation, tone generation, and Blowfish encryption and 20 echo cancelation, tone generation, and Blowfish encryption and
20 decryption. 21 decryption. It may use hardware features if available.
21 It may use hardware features if available. 22
22 E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu 23 E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu
23 and get more informations about this module and it's usage. 24 and get more information about this module and its usage.
25
24 If unsure, say 'N'. 26 If unsure, say 'N'.
25 27
26config MISDN_L1OIP 28config MISDN_L1OIP
diff --git a/drivers/isdn/mISDN/l1oip_codec.c b/drivers/isdn/mISDN/l1oip_codec.c
index 2ec4b28d9edc..e4ecba3d48df 100644
--- a/drivers/isdn/mISDN/l1oip_codec.c
+++ b/drivers/isdn/mISDN/l1oip_codec.c
@@ -331,7 +331,7 @@ l1oip_4bit_alloc(int ulaw)
331 /* alloc conversion tables */ 331 /* alloc conversion tables */
332 table_com = vmalloc(65536); 332 table_com = vmalloc(65536);
333 table_dec = vmalloc(512); 333 table_dec = vmalloc(512);
334 if (!table_com | !table_dec) { 334 if (!table_com || !table_dec) {
335 l1oip_4bit_free(); 335 l1oip_4bit_free();
336 return -ENOMEM; 336 return -ENOMEM;
337 } 337 }
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 556aeca0d860..d9db17624f12 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -100,7 +100,7 @@ config LEDS_HP6XX
100 tristate "LED Support for the HP Jornada 6xx" 100 tristate "LED Support for the HP Jornada 6xx"
101 depends on LEDS_CLASS && SH_HP6XX 101 depends on LEDS_CLASS && SH_HP6XX
102 help 102 help
103 This option enables led support for the handheld 103 This option enables LED support for the handheld
104 HP Jornada 620/660/680/690. 104 HP Jornada 620/660/680/690.
105 105
106config LEDS_PCA9532 106config LEDS_PCA9532
@@ -108,7 +108,7 @@ config LEDS_PCA9532
108 depends on LEDS_CLASS && I2C && INPUT && EXPERIMENTAL 108 depends on LEDS_CLASS && I2C && INPUT && EXPERIMENTAL
109 help 109 help
110 This option enables support for NXP pca9532 110 This option enables support for NXP pca9532
111 led controller. It is generally only usefull 111 LED controller. It is generally only useful
112 as a platform driver 112 as a platform driver
113 113
114config LEDS_GPIO 114config LEDS_GPIO
@@ -144,7 +144,7 @@ config LEDS_CLEVO_MAIL
144 Positivo Mobile (Clevo M5x0V) 144 Positivo Mobile (Clevo M5x0V)
145 145
146 If your model is not listed here you can try the "nodetect" 146 If your model is not listed here you can try the "nodetect"
147 module paramter. 147 module parameter.
148 148
149 To compile this driver as a module, choose M here: the 149 To compile this driver as a module, choose M here: the
150 module will be called leds-clevo-mail. 150 module will be called leds-clevo-mail.
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index 76ec7498e2d5..bd3b431c9710 100644
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * pca9532.c - 16-bit Led dimmer 2 * pca9532.c - 16-bit Led dimmer
3 * 3 *
4 * Copyright (C) 2008 Riku Voipio <riku.voipio@movial.fi> 4 * Copyright (C) 2008 Riku Voipio
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
@@ -367,7 +367,7 @@ static void __exit pca9532_exit(void)
367 i2c_del_driver(&pca9532_driver); 367 i2c_del_driver(&pca9532_driver);
368} 368}
369 369
370MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>"); 370MODULE_AUTHOR("Riku Voipio");
371MODULE_LICENSE("GPL"); 371MODULE_LICENSE("GPL");
372MODULE_DESCRIPTION("PCA 9532 LED dimmer"); 372MODULE_DESCRIPTION("PCA 9532 LED dimmer");
373 373
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 52c3f65b12d6..607d319ce8ed 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -148,7 +148,7 @@ config MEDIA_TUNER_XC5000
148 default m if MEDIA_TUNER_CUSTOMISE 148 default m if MEDIA_TUNER_CUSTOMISE
149 help 149 help
150 A driver for the silicon tuner XC5000 from Xceive. 150 A driver for the silicon tuner XC5000 from Xceive.
151 This device is only used inside a SiP called togther with a 151 This device is only used inside a SiP called together with a
152 demodulator for now. 152 demodulator for now.
153 153
154config MEDIA_TUNER_MXL5005S 154config MEDIA_TUNER_MXL5005S
diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index a206cee23f73..a486a7f81fa9 100644
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -479,7 +479,7 @@ config DVB_TUNER_DIB0070
479 default m if DVB_FE_CUSTOMISE 479 default m if DVB_FE_CUSTOMISE
480 help 480 help
481 A driver for the silicon baseband tuner DiB0070 from DiBcom. 481 A driver for the silicon baseband tuner DiB0070 from DiBcom.
482 This device is only used inside a SiP called togther with a 482 This device is only used inside a SiP called together with a
483 demodulator for now. 483 demodulator for now.
484 484
485comment "SEC control devices for DVB-S" 485comment "SEC control devices for DVB-S"
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index 1e81e713df63..172f1f928f02 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -74,7 +74,7 @@ static struct {
74} fw[] = { 74} fw[] = {
75#define _FW_ENTRY(a, b, c) { \ 75#define _FW_ENTRY(a, b, c) { \
76 .name = a, \ 76 .name = a, \
77 .file = 0, \ 77 .file = NULL, \
78 .lock = __RW_LOCK_UNLOCKED(fw[c].lock), \ 78 .lock = __RW_LOCK_UNLOCKED(fw[c].lock), \
79 .refcnt = 0, \ 79 .refcnt = 0, \
80 .data = { } } 80 .data = { } }
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 06a2b0f7737c..75f35dbb11dc 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -88,7 +88,7 @@ config MENELAUS
88 help 88 help
89 If you say yes here you get support for the Texas Instruments 89 If you say yes here you get support for the Texas Instruments
90 TWL92330/Menelaus Power Management chip. This include voltage 90 TWL92330/Menelaus Power Management chip. This include voltage
91 regulators, Dual slot memory card tranceivers, real-time clock 91 regulators, Dual slot memory card transceivers, real-time clock
92 and other features that are often used in portable devices like 92 and other features that are often used in portable devices like
93 cell phones and PDAs. 93 cell phones and PDAs.
94 94
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0b92b2f6ea68..6d1ac180f6ee 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -18,8 +18,8 @@ config ATMEL_PWM
18 depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 18 depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
19 help 19 help
20 This option enables device driver support for the PWM channels 20 This option enables device driver support for the PWM channels
21 on certain Atmel prcoessors. Pulse Width Modulation is used for 21 on certain Atmel processors. Pulse Width Modulation is used for
22 purposes including software controlled power-efficent backlights 22 purposes including software controlled power-efficient backlights
23 on LCD displays, motor control, and waveform generation. 23 on LCD displays, motor control, and waveform generation.
24 24
25config ATMEL_TCLIB 25config ATMEL_TCLIB
@@ -142,7 +142,7 @@ config ATMEL_SSC
142 tristate "Device driver for Atmel SSC peripheral" 142 tristate "Device driver for Atmel SSC peripheral"
143 depends on AVR32 || ARCH_AT91 143 depends on AVR32 || ARCH_AT91
144 ---help--- 144 ---help---
145 This option enables device driver support for Atmel Syncronized 145 This option enables device driver support for Atmel Synchronized
146 Serial Communication peripheral (SSC). 146 Serial Communication peripheral (SSC).
147 147
148 The SSC peripheral supports a wide variety of serial frame based 148 The SSC peripheral supports a wide variety of serial frame based
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 99d4b28d52ed..6fbb246c40bb 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -177,7 +177,7 @@ config MMC_SPI
177 select CRC7 177 select CRC7
178 select CRC_ITU_T 178 select CRC_ITU_T
179 help 179 help
180 Some systems accss MMC/SD/SDIO cards using a SPI controller 180 Some systems access MMC/SD/SDIO cards using a SPI controller
181 instead of using a "native" MMC/SD/SDIO controller. This has a 181 instead of using a "native" MMC/SD/SDIO controller. This has a
182 disadvantage of being relatively high overhead, but a compensating 182 disadvantage of being relatively high overhead, but a compensating
183 advantage of working on many systems without dedicated MMC/SD/SDIO 183 advantage of working on many systems without dedicated MMC/SD/SDIO
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e4226e02d63e..e51c1ed7ac18 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1773,4 +1773,4 @@ module_exit(cleanup_nanddoc);
1773 1773
1774MODULE_LICENSE("GPL"); 1774MODULE_LICENSE("GPL");
1775MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>"); 1775MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
1776MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver\n"); 1776MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver");
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index afbc3f8126db..a18e8d2f2557 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -136,7 +136,7 @@ static int write_eraseblock(int ebnum)
136 ops.ooblen = use_len; 136 ops.ooblen = use_len;
137 ops.oobretlen = 0; 137 ops.oobretlen = 0;
138 ops.ooboffs = use_offset; 138 ops.ooboffs = use_offset;
139 ops.datbuf = 0; 139 ops.datbuf = NULL;
140 ops.oobbuf = writebuf; 140 ops.oobbuf = writebuf;
141 err = mtd->write_oob(mtd, addr, &ops); 141 err = mtd->write_oob(mtd, addr, &ops);
142 if (err || ops.oobretlen != use_len) { 142 if (err || ops.oobretlen != use_len) {
@@ -189,7 +189,7 @@ static int verify_eraseblock(int ebnum)
189 ops.ooblen = use_len; 189 ops.ooblen = use_len;
190 ops.oobretlen = 0; 190 ops.oobretlen = 0;
191 ops.ooboffs = use_offset; 191 ops.ooboffs = use_offset;
192 ops.datbuf = 0; 192 ops.datbuf = NULL;
193 ops.oobbuf = readbuf; 193 ops.oobbuf = readbuf;
194 err = mtd->read_oob(mtd, addr, &ops); 194 err = mtd->read_oob(mtd, addr, &ops);
195 if (err || ops.oobretlen != use_len) { 195 if (err || ops.oobretlen != use_len) {
@@ -216,7 +216,7 @@ static int verify_eraseblock(int ebnum)
216 ops.ooblen = mtd->ecclayout->oobavail; 216 ops.ooblen = mtd->ecclayout->oobavail;
217 ops.oobretlen = 0; 217 ops.oobretlen = 0;
218 ops.ooboffs = 0; 218 ops.ooboffs = 0;
219 ops.datbuf = 0; 219 ops.datbuf = NULL;
220 ops.oobbuf = readbuf; 220 ops.oobbuf = readbuf;
221 err = mtd->read_oob(mtd, addr, &ops); 221 err = mtd->read_oob(mtd, addr, &ops);
222 if (err || ops.oobretlen != mtd->ecclayout->oobavail) { 222 if (err || ops.oobretlen != mtd->ecclayout->oobavail) {
@@ -281,7 +281,7 @@ static int verify_eraseblock_in_one_go(int ebnum)
281 ops.ooblen = len; 281 ops.ooblen = len;
282 ops.oobretlen = 0; 282 ops.oobretlen = 0;
283 ops.ooboffs = 0; 283 ops.ooboffs = 0;
284 ops.datbuf = 0; 284 ops.datbuf = NULL;
285 ops.oobbuf = readbuf; 285 ops.oobbuf = readbuf;
286 err = mtd->read_oob(mtd, addr, &ops); 286 err = mtd->read_oob(mtd, addr, &ops);
287 if (err || ops.oobretlen != len) { 287 if (err || ops.oobretlen != len) {
@@ -522,7 +522,7 @@ static int __init mtd_oobtest_init(void)
522 ops.ooblen = 1; 522 ops.ooblen = 1;
523 ops.oobretlen = 0; 523 ops.oobretlen = 0;
524 ops.ooboffs = mtd->ecclayout->oobavail; 524 ops.ooboffs = mtd->ecclayout->oobavail;
525 ops.datbuf = 0; 525 ops.datbuf = NULL;
526 ops.oobbuf = writebuf; 526 ops.oobbuf = writebuf;
527 printk(PRINT_PREF "attempting to start write past end of OOB\n"); 527 printk(PRINT_PREF "attempting to start write past end of OOB\n");
528 printk(PRINT_PREF "an error is expected...\n"); 528 printk(PRINT_PREF "an error is expected...\n");
@@ -542,7 +542,7 @@ static int __init mtd_oobtest_init(void)
542 ops.ooblen = 1; 542 ops.ooblen = 1;
543 ops.oobretlen = 0; 543 ops.oobretlen = 0;
544 ops.ooboffs = mtd->ecclayout->oobavail; 544 ops.ooboffs = mtd->ecclayout->oobavail;
545 ops.datbuf = 0; 545 ops.datbuf = NULL;
546 ops.oobbuf = readbuf; 546 ops.oobbuf = readbuf;
547 printk(PRINT_PREF "attempting to start read past end of OOB\n"); 547 printk(PRINT_PREF "attempting to start read past end of OOB\n");
548 printk(PRINT_PREF "an error is expected...\n"); 548 printk(PRINT_PREF "an error is expected...\n");
@@ -566,7 +566,7 @@ static int __init mtd_oobtest_init(void)
566 ops.ooblen = mtd->ecclayout->oobavail + 1; 566 ops.ooblen = mtd->ecclayout->oobavail + 1;
567 ops.oobretlen = 0; 567 ops.oobretlen = 0;
568 ops.ooboffs = 0; 568 ops.ooboffs = 0;
569 ops.datbuf = 0; 569 ops.datbuf = NULL;
570 ops.oobbuf = writebuf; 570 ops.oobbuf = writebuf;
571 printk(PRINT_PREF "attempting to write past end of device\n"); 571 printk(PRINT_PREF "attempting to write past end of device\n");
572 printk(PRINT_PREF "an error is expected...\n"); 572 printk(PRINT_PREF "an error is expected...\n");
@@ -586,7 +586,7 @@ static int __init mtd_oobtest_init(void)
586 ops.ooblen = mtd->ecclayout->oobavail + 1; 586 ops.ooblen = mtd->ecclayout->oobavail + 1;
587 ops.oobretlen = 0; 587 ops.oobretlen = 0;
588 ops.ooboffs = 0; 588 ops.ooboffs = 0;
589 ops.datbuf = 0; 589 ops.datbuf = NULL;
590 ops.oobbuf = readbuf; 590 ops.oobbuf = readbuf;
591 printk(PRINT_PREF "attempting to read past end of device\n"); 591 printk(PRINT_PREF "attempting to read past end of device\n");
592 printk(PRINT_PREF "an error is expected...\n"); 592 printk(PRINT_PREF "an error is expected...\n");
@@ -610,7 +610,7 @@ static int __init mtd_oobtest_init(void)
610 ops.ooblen = mtd->ecclayout->oobavail; 610 ops.ooblen = mtd->ecclayout->oobavail;
611 ops.oobretlen = 0; 611 ops.oobretlen = 0;
612 ops.ooboffs = 1; 612 ops.ooboffs = 1;
613 ops.datbuf = 0; 613 ops.datbuf = NULL;
614 ops.oobbuf = writebuf; 614 ops.oobbuf = writebuf;
615 printk(PRINT_PREF "attempting to write past end of device\n"); 615 printk(PRINT_PREF "attempting to write past end of device\n");
616 printk(PRINT_PREF "an error is expected...\n"); 616 printk(PRINT_PREF "an error is expected...\n");
@@ -630,7 +630,7 @@ static int __init mtd_oobtest_init(void)
630 ops.ooblen = mtd->ecclayout->oobavail; 630 ops.ooblen = mtd->ecclayout->oobavail;
631 ops.oobretlen = 0; 631 ops.oobretlen = 0;
632 ops.ooboffs = 1; 632 ops.ooboffs = 1;
633 ops.datbuf = 0; 633 ops.datbuf = NULL;
634 ops.oobbuf = readbuf; 634 ops.oobbuf = readbuf;
635 printk(PRINT_PREF "attempting to read past end of device\n"); 635 printk(PRINT_PREF "attempting to read past end of device\n");
636 printk(PRINT_PREF "an error is expected...\n"); 636 printk(PRINT_PREF "an error is expected...\n");
@@ -670,7 +670,7 @@ static int __init mtd_oobtest_init(void)
670 ops.ooblen = sz; 670 ops.ooblen = sz;
671 ops.oobretlen = 0; 671 ops.oobretlen = 0;
672 ops.ooboffs = 0; 672 ops.ooboffs = 0;
673 ops.datbuf = 0; 673 ops.datbuf = NULL;
674 ops.oobbuf = writebuf; 674 ops.oobbuf = writebuf;
675 err = mtd->write_oob(mtd, addr, &ops); 675 err = mtd->write_oob(mtd, addr, &ops);
676 if (err) 676 if (err)
@@ -698,7 +698,7 @@ static int __init mtd_oobtest_init(void)
698 ops.ooblen = mtd->ecclayout->oobavail * 2; 698 ops.ooblen = mtd->ecclayout->oobavail * 2;
699 ops.oobretlen = 0; 699 ops.oobretlen = 0;
700 ops.ooboffs = 0; 700 ops.ooboffs = 0;
701 ops.datbuf = 0; 701 ops.datbuf = NULL;
702 ops.oobbuf = readbuf; 702 ops.oobbuf = readbuf;
703 err = mtd->read_oob(mtd, addr, &ops); 703 err = mtd->read_oob(mtd, addr, &ops);
704 if (err) 704 if (err)
diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c
index 645e77fdc63d..79fc4530987b 100644
--- a/drivers/mtd/tests/mtd_readtest.c
+++ b/drivers/mtd/tests/mtd_readtest.c
@@ -71,7 +71,7 @@ static int read_eraseblock_by_page(int ebnum)
71 ops.ooblen = mtd->oobsize; 71 ops.ooblen = mtd->oobsize;
72 ops.oobretlen = 0; 72 ops.oobretlen = 0;
73 ops.ooboffs = 0; 73 ops.ooboffs = 0;
74 ops.datbuf = 0; 74 ops.datbuf = NULL;
75 ops.oobbuf = oobbuf; 75 ops.oobbuf = oobbuf;
76 ret = mtd->read_oob(mtd, addr, &ops); 76 ret = mtd->read_oob(mtd, addr, &ops);
77 if (ret || ops.oobretlen != mtd->oobsize) { 77 if (ret || ops.oobretlen != mtd->oobsize) {
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 88dd2e09832f..ce7551e17ba7 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2299,7 +2299,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)
2299 eaddr = sc->sbm_hwaddr; 2299 eaddr = sc->sbm_hwaddr;
2300 2300
2301 /* 2301 /*
2302 * Read the ethernet address. The firwmare left this programmed 2302 * Read the ethernet address. The firmware left this programmed
2303 * for us in the ethernet address register for each mac. 2303 * for us in the ethernet address register for each mac.
2304 */ 2304 */
2305 2305
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/skfp/h/hwmtm.h
index 1a606d4bfe5e..e1a7e5f683dc 100644
--- a/drivers/net/skfp/h/hwmtm.h
+++ b/drivers/net/skfp/h/hwmtm.h
@@ -145,7 +145,7 @@ struct hw_modul {
145 int leave_isr ; /* leave fddi_isr immedeately if set */ 145 int leave_isr ; /* leave fddi_isr immedeately if set */
146 int isr_flag ; /* set, when HWM is entered from isr */ 146 int isr_flag ; /* set, when HWM is entered from isr */
147 /* 147 /*
148 * varaibles for the current transmit frame 148 * variables for the current transmit frame
149 */ 149 */
150 struct s_smt_tx_queue *tx_p ; /* pointer to the transmit queue */ 150 struct s_smt_tx_queue *tx_p ; /* pointer to the transmit queue */
151 u_long tx_descr ; /* tx descriptor for FORMAC+ */ 151 u_long tx_descr ; /* tx descriptor for FORMAC+ */
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 1205c2a22657..437683aab32c 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -11225,7 +11225,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
11225 return tg3_phy_init(tp); 11225 return tg3_phy_init(tp);
11226 11226
11227 /* Reading the PHY ID register can conflict with ASF 11227 /* Reading the PHY ID register can conflict with ASF
11228 * firwmare access to the PHY hardware. 11228 * firmware access to the PHY hardware.
11229 */ 11229 */
11230 err = 0; 11230 err = 0;
11231 if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) || 11231 if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 00945f7c1e9b..25c9ef6a1815 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
69#endif 69#endif
70 70
71/* 71/*
72 * Modules parameters and associated varaibles 72 * Modules parameters and associated variables
73 */ 73 */
74static int fst_txq_low = FST_LOW_WATER_MARK; 74static int fst_txq_low = FST_LOW_WATER_MARK;
75static int fst_txq_high = FST_HIGH_WATER_MARK; 75static int fst_txq_high = FST_HIGH_WATER_MARK;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 115b70487502..f4e963ba768b 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2362,7 +2362,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
2362 i * sizeof(struct ipw2100_status)); 2362 i * sizeof(struct ipw2100_status));
2363 2363
2364#ifdef IPW2100_DEBUG_C3 2364#ifdef IPW2100_DEBUG_C3
2365 /* Halt the fimrware so we can get a good image */ 2365 /* Halt the firmware so we can get a good image */
2366 write_register(priv->net_dev, IPW_REG_RESET_REG, 2366 write_register(priv->net_dev, IPW_REG_RESET_REG,
2367 IPW_AUX_HOST_RESET_REG_STOP_MASTER); 2367 IPW_AUX_HOST_RESET_REG_STOP_MASTER);
2368 j = 5; 2368 j = 5;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 4a92af1d7877..e17a4593e1f5 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -8844,7 +8844,7 @@ static int ipw_wx_set_mode(struct net_device *dev,
8844#endif /* CONFIG_IPW2200_MONITOR */ 8844#endif /* CONFIG_IPW2200_MONITOR */
8845 8845
8846 /* Free the existing firmware and reset the fw_loaded 8846 /* Free the existing firmware and reset the fw_loaded
8847 * flag so ipw_load() will bring in the new firmawre */ 8847 * flag so ipw_load() will bring in the new firmware */
8848 free_firmware(); 8848 free_firmware();
8849 8849
8850 priv->ieee->iw_mode = wrqu->mode; 8850 priv->ieee->iw_mode = wrqu->mode;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 663dc83be501..3889158b359c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1337,7 +1337,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
1337 1337
1338 /* api_ver should match the api version forming part of the 1338 /* api_ver should match the api version forming part of the
1339 * firmware filename ... but we don't check for that and only rely 1339 * firmware filename ... but we don't check for that and only rely
1340 * on the API version read from firware header from here on forward */ 1340 * on the API version read from firmware header from here on forward */
1341 1341
1342 if (api_ver < api_min || api_ver > api_max) { 1342 if (api_ver < api_min || api_ver > api_max) {
1343 IWL_ERR(priv, "Driver unable to support your firmware API. " 1343 IWL_ERR(priv, "Driver unable to support your firmware API. "
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a71b08ca7c71..9d5f97dd7c73 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2562,7 +2562,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
2562 2562
2563 /* api_ver should match the api version forming part of the 2563 /* api_ver should match the api version forming part of the
2564 * firmware filename ... but we don't check for that and only rely 2564 * firmware filename ... but we don't check for that and only rely
2565 * on the API version read from firware header from here on forward */ 2565 * on the API version read from firmware header from here on forward */
2566 2566
2567 if (api_ver < api_min || api_ver > api_max) { 2567 if (api_ver < api_min || api_ver > api_max) {
2568 IWL_ERR(priv, "Driver unable to support your firmware API. " 2568 IWL_ERR(priv, "Driver unable to support your firmware API. "
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 639dd02d3d31..8c3605cdc64c 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1649,7 +1649,7 @@ static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv)
1649 1649
1650/** 1650/**
1651 * @brief This function executes next command in command 1651 * @brief This function executes next command in command
1652 * pending queue. It will put fimware back to PS mode 1652 * pending queue. It will put firmware back to PS mode
1653 * if applicable. 1653 * if applicable.
1654 * 1654 *
1655 * @param priv A pointer to struct lbs_private structure 1655 * @param priv A pointer to struct lbs_private structure
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fe7ac2cea7c9..445fb6f7ea3f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -593,7 +593,7 @@ EXPORT_SYMBOL_GPL(__pci_complete_power_transition);
593 * @dev: PCI device to handle. 593 * @dev: PCI device to handle.
594 * @state: PCI power state (D0, D1, D2, D3hot) to put the device into. 594 * @state: PCI power state (D0, D1, D2, D3hot) to put the device into.
595 * 595 *
596 * Transition a device to a new power state, using the platform formware and/or 596 * Transition a device to a new power state, using the platform firmware and/or
597 * the device's PCI PM registers. 597 * the device's PCI PM registers.
598 * 598 *
599 * RETURN VALUE: 599 * RETURN VALUE:
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 3dad27a385d3..d99f1cd435a2 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -5811,7 +5811,7 @@ static struct ibm_struct volume_driver_data = {
5811 * ThinkPads from this same time period (and earlier) probably lack the 5811 * ThinkPads from this same time period (and earlier) probably lack the
5812 * tachometer as well. 5812 * tachometer as well.
5813 * 5813 *
5814 * Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare 5814 * Unfortunately a lot of ThinkPads with new-style ECs but whose firmware
5815 * was never fixed by IBM to report the EC firmware version string 5815 * was never fixed by IBM to report the EC firmware version string
5816 * probably support the tachometer (like the early X models), so 5816 * probably support the tachometer (like the early X models), so
5817 * detecting it is quite hard. We need more data to know for sure. 5817 * detecting it is quite hard. We need more data to know for sure.
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 0c056fcc01ce..62bb98124e26 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -83,7 +83,7 @@ static int bq27x00_read(u8 reg, int *rt_value, int b_single,
83} 83}
84 84
85/* 85/*
86 * Return the battery temperature in Celcius degrees 86 * Return the battery temperature in Celsius degrees
87 * Or < 0 if something fails. 87 * Or < 0 if something fails.
88 */ 88 */
89static int bq27x00_battery_temperature(struct bq27x00_device_info *di) 89static int bq27x00_battery_temperature(struct bq27x00_device_info *di)
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e2f44e6c0bcb..20297c521e50 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1380,7 +1380,7 @@ config SCSI_LPFC_DEBUG_FS
1380 bool "Emulex LightPulse Fibre Channel debugfs Support" 1380 bool "Emulex LightPulse Fibre Channel debugfs Support"
1381 depends on SCSI_LPFC && DEBUG_FS 1381 depends on SCSI_LPFC && DEBUG_FS
1382 help 1382 help
1383 This makes debugging infomation from the lpfc driver 1383 This makes debugging information from the lpfc driver
1384 available via the debugfs filesystem. 1384 available via the debugfs filesystem.
1385 1385
1386config SCSI_SIM710 1386config SCSI_SIM710
@@ -1388,7 +1388,7 @@ config SCSI_SIM710
1388 depends on (EISA || MCA) && SCSI 1388 depends on (EISA || MCA) && SCSI
1389 select SCSI_SPI_ATTRS 1389 select SCSI_SPI_ATTRS
1390 ---help--- 1390 ---help---
1391 This driver for NCR53c710 based SCSI host adapters. 1391 This driver is for NCR53c710 based SCSI host adapters.
1392 1392
1393 It currently supports Compaq EISA cards and NCR MCA cards 1393 It currently supports Compaq EISA cards and NCR MCA cards
1394 1394
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9be11b0963f2..aa9d3a4c2d50 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1374,7 +1374,7 @@ config SERIAL_BFIN_SPORT
1374 depends on BLACKFIN && EXPERIMENTAL 1374 depends on BLACKFIN && EXPERIMENTAL
1375 select SERIAL_CORE 1375 select SERIAL_CORE
1376 help 1376 help
1377 Enble support SPORT emulate UART on Blackfin series. 1377 Enable SPORT emulate UART on Blackfin series.
1378 1378
1379 To compile this driver as a module, choose M here: the 1379 To compile this driver as a module, choose M here: the
1380 module will be called bfin_sport_uart. 1380 module will be called bfin_sport_uart.
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 211af86a6c55..92981c2383ee 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -4,7 +4,7 @@ menuconfig STAGING
4 ---help--- 4 ---help---
5 This option allows you to select a number of drivers that are 5 This option allows you to select a number of drivers that are
6 not of the "normal" Linux kernel quality level. These drivers 6 not of the "normal" Linux kernel quality level. These drivers
7 are placed here in order to get a wider audience for use of 7 are placed here in order to get a wider audience to make use of
8 them. Please note that these drivers are under heavy 8 them. Please note that these drivers are under heavy
9 development, may or may not work, and may contain userspace 9 development, may or may not work, and may contain userspace
10 interfaces that most likely will be changed in the near 10 interfaces that most likely will be changed in the near
@@ -12,7 +12,7 @@ menuconfig STAGING
12 12
13 Using any of these drivers will taint your kernel which might 13 Using any of these drivers will taint your kernel which might
14 affect support options from both the community, and various 14 affect support options from both the community, and various
15 commercial support orginizations. 15 commercial support organizations.
16 16
17 If you wish to work on these drivers, to help improve them, or 17 If you wish to work on these drivers, to help improve them, or
18 to report problems you have with them, please see the 18 to report problems you have with them, please see the
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index b47ca1e7e383..83a93a5c6392 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1,9 +1,9 @@
1config COMEDI 1config COMEDI
2 tristate "Data Acquision support (comedi)" 2 tristate "Data acquisition support (comedi)"
3 default N 3 default N
4 depends on m 4 depends on m
5 ---help--- 5 ---help---
6 Enable support a wide range of data acquision devices 6 Enable support a wide range of data acquisition devices
7 for Linux. 7 for Linux.
8 8
9config COMEDI_RT 9config COMEDI_RT
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig
index f2cf7f66ae05..ca6ade6c4b47 100644
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@ -10,7 +10,7 @@ config VIDEO_GO7007
10 select CRC32 10 select CRC32
11 default N 11 default N
12 ---help--- 12 ---help---
13 This is a video4linux driver for some wierd device... 13 This is a video4linux driver for some weird device...
14 14
15 To compile this driver as a module, choose M here: the 15 To compile this driver as a module, choose M here: the
16 module will be called go7007 16 module will be called go7007
@@ -20,7 +20,7 @@ config VIDEO_GO7007_USB
20 depends on VIDEO_GO7007 && USB 20 depends on VIDEO_GO7007 && USB
21 default N 21 default N
22 ---help--- 22 ---help---
23 This is a video4linux driver for some wierd device... 23 This is a video4linux driver for some weird device...
24 24
25 To compile this driver as a module, choose M here: the 25 To compile this driver as a module, choose M here: the
26 module will be called go7007-usb 26 module will be called go7007-usb
diff --git a/drivers/staging/otus/hal/hpmain.c b/drivers/staging/otus/hal/hpmain.c
index 2e65c466aae8..dab278326931 100644
--- a/drivers/staging/otus/hal/hpmain.c
+++ b/drivers/staging/otus/hal/hpmain.c
@@ -152,7 +152,7 @@ u16_t zfHpInit(zdev_t* dev, u32_t frequency)
152 else 152 else
153 { 153 {
154 #ifndef ZM_OTUS_LINUX_PHASE_2 154 #ifndef ZM_OTUS_LINUX_PHASE_2
155 /* donwload the normal frimware */ 155 /* download the normal firmware */
156 if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage, 156 if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
157 (u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS) 157 (u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
158 { 158 {
diff --git a/drivers/staging/panel/Kconfig b/drivers/staging/panel/Kconfig
index c4b30f2a549b..3abe7c9d558d 100644
--- a/drivers/staging/panel/Kconfig
+++ b/drivers/staging/panel/Kconfig
@@ -110,7 +110,7 @@ config PANEL_LCD_BWIDTH
110 ---help--- 110 ---help---
111 Most LCDs use a standard controller which supports hardware lines of 40 111 Most LCDs use a standard controller which supports hardware lines of 40
112 characters, although sometimes only 16, 20 or 24 of them are really wired 112 characters, although sometimes only 16, 20 or 24 of them are really wired
113 to the terminal. This results in some non-visible but adressable characters, 113 to the terminal. This results in some non-visible but addressable characters,
114 and is the case for most parallel LCDs. Other LCDs, and some serial ones, 114 and is the case for most parallel LCDs. Other LCDs, and some serial ones,
115 however, use the same line width internally as what is visible. The KS0074 115 however, use the same line width internally as what is visible. The KS0074
116 for example, uses 16 characters per line for 16 visible characters per line. 116 for example, uses 16 characters per line for 16 visible characters per line.
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index b6483dd98acc..9cf9ff69e3e3 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -626,7 +626,7 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, void *conte
626 goto err_fw_corrupted; 626 goto err_fw_corrupted;
627 627
628 /* 628 /*
629 * Start to upload formware : send reset 629 * Start to upload firmware : send reset
630 */ 630 */
631 value = 1; 631 value = 1;
632 ret = uea_send_modem_cmd(usb, F8051_USBCS, sizeof(value), &value); 632 ret = uea_send_modem_cmd(usb, F8051_USBCS, sizeof(value), &value);
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 770b3eaa9184..080bb1e4b847 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -392,7 +392,7 @@ config USB_GADGET_FSL_QE
392 controllers having QE or CPM2, given minor tweaks. 392 controllers having QE or CPM2, given minor tweaks.
393 393
394 Set CONFIG_USB_GADGET to "m" to build this driver as a 394 Set CONFIG_USB_GADGET to "m" to build this driver as a
395 dynmically linked module called "fsl_qe_udc". 395 dynamically linked module called "fsl_qe_udc".
396 396
397config USB_FSL_QE 397config USB_FSL_QE
398 tristate 398 tristate
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index c1b279939bbf..f13fd488ebec 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -715,7 +715,7 @@ io_edgeport.c Change Log comments:
715 715
716 0.2 (01/30/2000) greg kroah-hartman 716 0.2 (01/30/2000) greg kroah-hartman
717 Milestone 1 release. 717 Milestone 1 release.
718 Device is found by USB subsystem, enumerated, fimware is downloaded 718 Device is found by USB subsystem, enumerated, firmware is downloaded
719 and the descriptors are printed to the debug log, config is set, and 719 and the descriptors are printed to the debug log, config is set, and
720 green light starts to blink. Open port works, and data can be sent 720 green light starts to blink. Open port works, and data can be sent
721 and received at the default settings of the UART. Loopback connector 721 and received at the default settings of the UART. Loopback connector
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index a65f9196b0a0..c480ea4c19f2 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -518,8 +518,8 @@ config USB_SERIAL_SIERRAWIRELESS
518 help 518 help
519 Say M here if you want to use Sierra Wireless devices. 519 Say M here if you want to use Sierra Wireless devices.
520 520
521 Many deviecs have a feature known as TRU-Install, for those devices 521 Many devices have a feature known as TRU-Install. For those devices
522 to work properly the USB Storage Sierra feature must be enabled. 522 to work properly, the USB Storage Sierra feature must be enabled.
523 523
524 To compile this driver as a module, choose M here: the 524 To compile this driver as a module, choose M here: the
525 module will be called sierra. 525 module will be called sierra.
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 8118db7f1d8d..b2f149fedcc5 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -562,7 +562,7 @@ void wusbhc_gtk_rekey(struct wusbhc *wusbhc)
562 struct wusb_dev *wusb_dev; 562 struct wusb_dev *wusb_dev;
563 563
564 wusb_dev = wusbhc->port[p].wusb_dev; 564 wusb_dev = wusbhc->port[p].wusb_dev;
565 if (!wusb_dev || !wusb_dev->usb_dev | !wusb_dev->usb_dev->authenticated) 565 if (!wusb_dev || !wusb_dev->usb_dev || !wusb_dev->usb_dev->authenticated)
566 continue; 566 continue;
567 567
568 usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev, 568 usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev,
diff --git a/drivers/uwb/Kconfig b/drivers/uwb/Kconfig
index ca783127af36..bac8e7a6f17b 100644
--- a/drivers/uwb/Kconfig
+++ b/drivers/uwb/Kconfig
@@ -48,10 +48,10 @@ config UWB_WHCI
48 help 48 help
49 This driver enables the radio controller for WHCI cards. 49 This driver enables the radio controller for WHCI cards.
50 50
51 WHCI is an specification developed by Intel 51 WHCI is a specification developed by Intel
52 (http://www.intel.com/technology/comms/wusb/whci.htm) much 52 (http://www.intel.com/technology/comms/wusb/whci.htm) much
53 in the spirit of USB's EHCI, but for UWB and Wireless USB 53 in the spirit of USB's EHCI, but for UWB and Wireless USB
54 radio/host controllers connected via memmory mapping (eg: 54 radio/host controllers connected via memory mapping (eg:
55 PCI). Most of these cards come also with a Wireless USB host 55 PCI). Most of these cards come also with a Wireless USB host
56 controller. 56 controller.
57 57
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 526187c8a12d..8ac9cddac575 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -37,7 +37,7 @@ config XEN_COMPAT_XENFS
37 The old xenstore userspace tools expect to find "xenbus" 37 The old xenstore userspace tools expect to find "xenbus"
38 under /proc/xen, but "xenbus" is now found at the root of the 38 under /proc/xen, but "xenbus" is now found at the root of the
39 xenfs filesystem. Selecting this causes the kernel to create 39 xenfs filesystem. Selecting this causes the kernel to create
40 the compatibilty mount point /proc/xen if it is running on 40 the compatibility mount point /proc/xen if it is running on
41 a xen platform. 41 a xen platform.
42 If in doubt, say yes. 42 If in doubt, say yes.
43 43
diff --git a/fs/bio.c b/fs/bio.c
index a040cde7f6fd..e0c9e545bbfa 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1420,8 +1420,7 @@ static void bio_pair_end_2(struct bio *bi, int err)
1420} 1420}
1421 1421
1422/* 1422/*
1423 * split a bio - only worry about a bio with a single page 1423 * split a bio - only worry about a bio with a single page in its iovec
1424 * in it's iovec
1425 */ 1424 */
1426struct bio_pair *bio_split(struct bio *bi, int first_sectors) 1425struct bio_pair *bio_split(struct bio *bi, int first_sectors)
1427{ 1426{
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index 7505482a08fa..418b6f3b0ae8 100644
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -18,7 +18,7 @@ config EXT4_FS
18 filesystem; while there will be some performance gains from 18 filesystem; while there will be some performance gains from
19 the delayed allocation and inode table readahead, the best 19 the delayed allocation and inode table readahead, the best
20 performance gains will require enabling ext4 features in the 20 performance gains will require enabling ext4 features in the
21 filesystem, or formating a new filesystem as an ext4 21 filesystem, or formatting a new filesystem as an ext4
22 filesystem initially. 22 filesystem initially.
23 23
24 To compile this file system support as a module, choose M here. The 24 To compile this file system support as a module, choose M here. The
diff --git a/fs/file_table.c b/fs/file_table.c
index b74a8e1da913..54018fe48840 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -169,7 +169,6 @@ struct file *alloc_file(struct vfsmount *mnt, struct dentry *dentry,
169 fmode_t mode, const struct file_operations *fop) 169 fmode_t mode, const struct file_operations *fop)
170{ 170{
171 struct file *file; 171 struct file *file;
172 struct path;
173 172
174 file = get_empty_filp(); 173 file = get_empty_filp();
175 if (!file) 174 if (!file)
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index eed480639902..91013ff7dd53 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -435,7 +435,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
435 * If older_than_this is non-NULL, then only write out inodes which 435 * If older_than_this is non-NULL, then only write out inodes which
436 * had their first dirtying at a time earlier than *older_than_this. 436 * had their first dirtying at a time earlier than *older_than_this.
437 * 437 *
438 * If we're a pdlfush thread, then implement pdflush collision avoidance 438 * If we're a pdflush thread, then implement pdflush collision avoidance
439 * against the entire list. 439 * against the entire list.
440 * 440 *
441 * If `bdi' is non-zero then we're being asked to writeback a specific queue. 441 * If `bdi' is non-zero then we're being asked to writeback a specific queue.
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index b446d7ad0b0d..7e14d1a04001 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -76,7 +76,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
76 76
77/* 77/*
78 * display a list of all the REGIONs the kernel knows about 78 * display a list of all the REGIONs the kernel knows about
79 * - nommu kernals have a single flat list 79 * - nommu kernels have a single flat list
80 */ 80 */
81static int nommu_region_list_show(struct seq_file *m, void *_p) 81static int nommu_region_list_show(struct seq_file *m, void *_p)
82{ 82{
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index e35b54d5059d..830e3f76f442 100644
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -22,7 +22,7 @@ config UBIFS_FS_ADVANCED_COMPR
22 depends on UBIFS_FS 22 depends on UBIFS_FS
23 help 23 help
24 This option allows to explicitly choose which compressions, if any, 24 This option allows to explicitly choose which compressions, if any,
25 are enabled in UBIFS. Removing compressors means inbility to read 25 are enabled in UBIFS. Removing compressors means inability to read
26 existing file systems. 26 existing file systems.
27 27
28 If unsure, say 'N'. 28 If unsure, say 'N'.
@@ -32,7 +32,7 @@ config UBIFS_FS_LZO
32 depends on UBIFS_FS 32 depends on UBIFS_FS
33 default y 33 default y
34 help 34 help
35 LZO compressor is generally faster then zlib but compresses worse. 35 LZO compressor is generally faster than zlib but compresses worse.
36 Say 'Y' if unsure. 36 Say 'Y' if unsure.
37 37
38config UBIFS_FS_ZLIB 38config UBIFS_FS_ZLIB
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 4316a546beb5..665fa70e4094 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -365,7 +365,10 @@ int cgroup_task_count(const struct cgroup *cgrp);
365/* Return true if cgrp is a descendant of the task's cgroup */ 365/* Return true if cgrp is a descendant of the task's cgroup */
366int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task); 366int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task);
367 367
368/* Control Group subsystem type. See Documentation/cgroups.txt for details */ 368/*
369 * Control Group subsystem type.
370 * See Documentation/cgroups/cgroups.txt for details
371 */
369 372
370struct cgroup_subsys { 373struct cgroup_subsys {
371 struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss, 374 struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss,
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 2c6943152c21..53ae4399da2d 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -35,7 +35,7 @@
35#define journal_oom_retry 1 35#define journal_oom_retry 1
36 36
37/* 37/*
38 * Define JBD_PARANIOD_IOFAIL to cause a kernel BUG() if ext3 finds 38 * Define JBD_PARANOID_IOFAIL to cause a kernel BUG() if ext3 finds
39 * certain classes of error which can occur due to failed IOs. Under 39 * certain classes of error which can occur due to failed IOs. Under
40 * normal use we want ext3 to continue after such errors, because 40 * normal use we want ext3 to continue after such errors, because
41 * hardware _can_ fail, but for debugging purposes when running tests on 41 * hardware _can_ fail, but for debugging purposes when running tests on
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 76262d83656b..b450a2628855 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -379,7 +379,7 @@ enum {
379 ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */ 379 ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */
380 ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands 380 ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
381 not multiple of 16 bytes */ 381 not multiple of 16 bytes */
382 ATA_HORKAGE_FIRMWARE_WARN = (1 << 12), /* firwmare update warning */ 382 ATA_HORKAGE_FIRMWARE_WARN = (1 << 12), /* firmware update warning */
383 ATA_HORKAGE_1_5_GBPS = (1 << 13), /* force 1.5 Gbps */ 383 ATA_HORKAGE_1_5_GBPS = (1 << 13), /* force 1.5 Gbps */
384 384
385 /* DMA mask for user DMA control: User visible values; DO NOT 385 /* DMA mask for user DMA control: User visible values; DO NOT
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 3945f803d514..7c775751392c 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -28,4 +28,4 @@ int pwm_enable(struct pwm_device *pwm);
28 */ 28 */
29void pwm_disable(struct pwm_device *pwm); 29void pwm_disable(struct pwm_device *pwm);
30 30
31#endif /* __ASM_ARCH_PWM_H */ 31#endif /* __LINUX_PWM_H */
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index 5f401b644ed5..429c631d2aad 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -80,8 +80,7 @@ struct wusb_ckhdid {
80 u8 data[16]; 80 u8 data[16];
81} __attribute__((packed)); 81} __attribute__((packed));
82 82
83const static 83static const struct wusb_ckhdid wusb_ckhdid_zero = { .data = { 0 } };
84struct wusb_ckhdid wusb_ckhdid_zero = { .data = { 0 } };
85 84
86#define WUSB_CKHDID_STRSIZE (3 * sizeof(struct wusb_ckhdid) + 1) 85#define WUSB_CKHDID_STRSIZE (3 * sizeof(struct wusb_ckhdid) + 1)
87 86
diff --git a/init/Kconfig b/init/Kconfig
index 236a79377b8e..90e884bb5216 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -565,7 +565,7 @@ config CGROUP_MEM_RES_CTLR
565 select MM_OWNER 565 select MM_OWNER
566 help 566 help
567 Provides a memory resource controller that manages both anonymous 567 Provides a memory resource controller that manages both anonymous
568 memory and page cache. (See Documentation/controllers/memory.txt) 568 memory and page cache. (See Documentation/cgroups/memory.txt)
569 569
570 Note that setting this option increases fixed memory overhead 570 Note that setting this option increases fixed memory overhead
571 associated with each page of memory in the system. By this, 571 associated with each page of memory in the system. By this,
@@ -689,7 +689,7 @@ config PID_NS
689 depends on NAMESPACES && EXPERIMENTAL 689 depends on NAMESPACES && EXPERIMENTAL
690 help 690 help
691 Support process id namespaces. This allows having multiple 691 Support process id namespaces. This allows having multiple
692 process with the same pid as long as they are in different 692 processes with the same pid as long as they are in different
693 pid namespaces. This is a building block of containers. 693 pid namespaces. This is a building block of containers.
694 694
695 Unless you want to work with an experimental feature 695 Unless you want to work with an experimental feature
@@ -954,7 +954,7 @@ config COMPAT_BRK
954 Randomizing heap placement makes heap exploits harder, but it 954 Randomizing heap placement makes heap exploits harder, but it
955 also breaks ancient binaries (including anything libc5 based). 955 also breaks ancient binaries (including anything libc5 based).
956 This option changes the bootup default to heap randomization 956 This option changes the bootup default to heap randomization
957 disabled, and can be overriden runtime by setting 957 disabled, and can be overridden at runtime by setting
958 /proc/sys/kernel/randomize_va_space to 2. 958 /proc/sys/kernel/randomize_va_space to 2.
959 959
960 On non-ancient distros (post-2000 ones) N is usually a safe choice. 960 On non-ancient distros (post-2000 ones) N is usually a safe choice.
@@ -1124,7 +1124,7 @@ config INIT_ALL_POSSIBLE
1124 cpu_possible_map, some of them chose to initialize cpu_possible_map 1124 cpu_possible_map, some of them chose to initialize cpu_possible_map
1125 with all 1s, and others with all 0s. When they were centralised, 1125 with all 1s, and others with all 0s. When they were centralised,
1126 it was better to provide this option than to break all the archs 1126 it was better to provide this option than to break all the archs
1127 and have several arch maintainers persuing me down dark alleys. 1127 and have several arch maintainers pursuing me down dark alleys.
1128 1128
1129config STOP_MACHINE 1129config STOP_MACHINE
1130 bool 1130 bool
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index f3db382c2b2d..5f21ab2bbcdf 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -289,7 +289,7 @@ static int create_image(int platform_mode)
289 * hibernation_snapshot - quiesce devices and create the hibernation 289 * hibernation_snapshot - quiesce devices and create the hibernation
290 * snapshot image. 290 * snapshot image.
291 * @platform_mode - if set, use the platform driver, if available, to 291 * @platform_mode - if set, use the platform driver, if available, to
292 * prepare the platform frimware for the power transition. 292 * prepare the platform firmware for the power transition.
293 * 293 *
294 * Must be called with pm_mutex held 294 * Must be called with pm_mutex held
295 */ 295 */
@@ -412,7 +412,7 @@ static int resume_target_kernel(bool platform_mode)
412 * hibernation_restore - quiesce devices and restore the hibernation 412 * hibernation_restore - quiesce devices and restore the hibernation
413 * snapshot image. If successful, control returns in hibernation_snaphot() 413 * snapshot image. If successful, control returns in hibernation_snaphot()
414 * @platform_mode - if set, use the platform driver, if available, to 414 * @platform_mode - if set, use the platform driver, if available, to
415 * prepare the platform frimware for the transition. 415 * prepare the platform firmware for the transition.
416 * 416 *
417 * Must be called with pm_mutex held 417 * Must be called with pm_mutex held
418 */ 418 */
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 34e707e5ab87..504086ab4443 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -72,11 +72,10 @@ config FUNCTION_GRAPH_TRACER
72 help 72 help
73 Enable the kernel to trace a function at both its return 73 Enable the kernel to trace a function at both its return
74 and its entry. 74 and its entry.
75 It's first purpose is to trace the duration of functions and 75 Its first purpose is to trace the duration of functions and
76 draw a call graph for each thread with some informations like 76 draw a call graph for each thread with some information like
77 the return value. 77 the return value. This is done by setting the current return
78 This is done by setting the current return address on the current 78 address on the current task structure into a stack of calls.
79 task structure into a stack of calls.
80 79
81config IRQSOFF_TRACER 80config IRQSOFF_TRACER
82 bool "Interrupts-off Latency Tracer" 81 bool "Interrupts-off Latency Tracer"
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index fdf913dfc7e8..53e8c8bc0c98 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1908,7 +1908,7 @@ int register_ftrace_function(struct ftrace_ops *ops)
1908} 1908}
1909 1909
1910/** 1910/**
1911 * unregister_ftrace_function - unresgister a function for profiling. 1911 * unregister_ftrace_function - unregister a function for profiling.
1912 * @ops - ops structure that holds the function to unregister 1912 * @ops - ops structure that holds the function to unregister
1913 * 1913 *
1914 * Unregister a function that was added to be called by ftrace profiling. 1914 * Unregister a function that was added to be called by ftrace profiling.
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0284e528748d..3f30189896fd 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -331,7 +331,7 @@ static int destroy_compound_page(struct page *page, unsigned long order)
331 for (i = 1; i < nr_pages; i++) { 331 for (i = 1; i < nr_pages; i++) {
332 struct page *p = page + i; 332 struct page *p = page + i;
333 333
334 if (unlikely(!PageTail(p) | (p->first_page != page))) { 334 if (unlikely(!PageTail(p) || (p->first_page != page))) {
335 bad_page(page); 335 bad_page(page);
336 bad++; 336 bad++;
337 } 337 }
diff --git a/net/Kconfig b/net/Kconfig
index ec93e7e38b38..ce77db4fcec8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -140,7 +140,7 @@ config NETFILTER_ADVANCED
140 default y 140 default y
141 help 141 help
142 If you say Y here you can select between all the netfilter modules. 142 If you say Y here you can select between all the netfilter modules.
143 If you say N the more ununsual ones will not be shown and the 143 If you say N the more unusual ones will not be shown and the
144 basic ones needed by most people will default to 'M'. 144 basic ones needed by most people will default to 'M'.
145 145
146 If unsure, say Y. 146 If unsure, say Y.
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ec992159b5f8..ca8cb326d1d2 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -22,17 +22,17 @@ menuconfig IPV6
22if IPV6 22if IPV6
23 23
24config IPV6_PRIVACY 24config IPV6_PRIVACY
25 bool "IPv6: Privacy Extensions support" 25 bool "IPv6: Privacy Extensions (RFC 3041) support"
26 ---help--- 26 ---help---
27 Privacy Extensions for Stateless Address Autoconfiguration in IPv6 27 Privacy Extensions for Stateless Address Autoconfiguration in IPv6
28 support. With this option, additional periodically-alter 28 support. With this option, additional periodically-altered
29 pseudo-random global-scope unicast address(es) will assigned to 29 pseudo-random global-scope unicast address(es) will be assigned to
30 your interface(s). 30 your interface(s).
31 31
32 We use our standard pseudo random algorithm to generate randomized 32 We use our standard pseudo-random algorithm to generate the
33 interface identifier, instead of one described in RFC 3041. 33 randomized interface identifier, instead of one described in RFC 3041.
34 34
35 By default, kernel do not generate temporary addresses. 35 By default the kernel does not generate temporary addresses.
36 To use temporary addresses, do 36 To use temporary addresses, do
37 37
38 echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr 38 echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr
@@ -43,9 +43,9 @@ config IPV6_ROUTER_PREF
43 bool "IPv6: Router Preference (RFC 4191) support" 43 bool "IPv6: Router Preference (RFC 4191) support"
44 ---help--- 44 ---help---
45 Router Preference is an optional extension to the Router 45 Router Preference is an optional extension to the Router
46 Advertisement message to improve the ability of hosts 46 Advertisement message which improves the ability of hosts
47 to pick more appropriate router, especially when the hosts 47 to pick an appropriate router, especially when the hosts
48 is placed in a multi-homed network. 48 are placed in a multi-homed network.
49 49
50 If unsure, say N. 50 If unsure, say N.
51 51
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 60c16162474c..f3d9ae350fb6 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -33,7 +33,7 @@ choice
33 ---help--- 33 ---help---
34 This option selects the default rate control algorithm 34 This option selects the default rate control algorithm
35 mac80211 will use. Note that this default can still be 35 mac80211 will use. Note that this default can still be
36 overriden through the ieee80211_default_rc_algo module 36 overridden through the ieee80211_default_rc_algo module
37 parameter if different algorithms are available. 37 parameter if different algorithms are available.
38 38
39config MAC80211_RC_DEFAULT_PID 39config MAC80211_RC_DEFAULT_PID
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 2c967e4f706c..bb279bf59a1b 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -52,7 +52,7 @@ config NF_CT_ACCT
52 52
53 Please note that currently this option only sets a default state. 53 Please note that currently this option only sets a default state.
54 You may change it at boot time with nf_conntrack.acct=0/1 kernel 54 You may change it at boot time with nf_conntrack.acct=0/1 kernel
55 paramater or by loading the nf_conntrack module with acct=0/1. 55 parameter or by loading the nf_conntrack module with acct=0/1.
56 56
57 You may also disable/enable it on a running system with: 57 You may also disable/enable it on a running system with:
58 sysctl net.netfilter.nf_conntrack_acct=0/1 58 sysctl net.netfilter.nf_conntrack_acct=0/1
diff --git a/net/phonet/Kconfig b/net/phonet/Kconfig
index 51a5669573f2..6ec7d55b1769 100644
--- a/net/phonet/Kconfig
+++ b/net/phonet/Kconfig
@@ -6,7 +6,7 @@ config PHONET
6 tristate "Phonet protocols family" 6 tristate "Phonet protocols family"
7 help 7 help
8 The Phone Network protocol (PhoNet) is a packet-oriented 8 The Phone Network protocol (PhoNet) is a packet-oriented
9 communication protocol developped by Nokia for use with its modems. 9 communication protocol developed by Nokia for use with its modems.
10 10
11 This is required for Maemo to use cellular data connectivity (if 11 This is required for Maemo to use cellular data connectivity (if
12 supported). It can also be used to control Nokia phones 12 supported). It can also be used to control Nokia phones
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index afd91c78ce8e..443c161eb8bd 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -47,7 +47,7 @@ config RPCSEC_GSS_SPKM3
47 select CRYPTO_CBC 47 select CRYPTO_CBC
48 help 48 help
49 Choose Y here to enable Secure RPC using the SPKM3 public key 49 Choose Y here to enable Secure RPC using the SPKM3 public key
50 GSS-API mechansim (RFC 2025). 50 GSS-API mechanism (RFC 2025).
51 51
52 Secure RPC calls with SPKM3 require an auxiliary userspace 52 Secure RPC calls with SPKM3 require an auxiliary userspace
53 daemon which may be found in the Linux nfs-utils package 53 daemon which may be found in the Linux nfs-utils package
diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig
index 18495cdcd10d..1b46747a5f5a 100644
--- a/net/wimax/Kconfig
+++ b/net/wimax/Kconfig
@@ -8,7 +8,7 @@
8# 8#
9# As well, enablement of the RFKILL code means we need the INPUT layer 9# As well, enablement of the RFKILL code means we need the INPUT layer
10# support to inject events coming from hw rfkill switches. That 10# support to inject events coming from hw rfkill switches. That
11# dependency could be killed if input.h provided appropiate means to 11# dependency could be killed if input.h provided appropriate means to
12# work when input is disabled. 12# work when input is disabled.
13 13
14comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" 14comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled"
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 16517a5a1301..83f5ee236b12 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -46,7 +46,7 @@
46 * load the driver as it did in previous versions. 46 * load the driver as it did in previous versions.
47 * 04-07-1999: Anthony Barbachan <barbcode@xmen.cis.fordham.edu> 47 * 04-07-1999: Anthony Barbachan <barbcode@xmen.cis.fordham.edu>
48 * Added module parameter pss_firmware to allow the user to tell 48 * Added module parameter pss_firmware to allow the user to tell
49 * the driver where the fireware file is located. The default 49 * the driver where the firmware file is located. The default
50 * setting is the previous hardcoded setting "/etc/sound/pss_synth". 50 * setting is the previous hardcoded setting "/etc/sound/pss_synth".
51 * 00-03-03: Christoph Hellwig <chhellwig@infradead.org> 51 * 00-03-03: Christoph Hellwig <chhellwig@infradead.org>
52 * Adapted to module_init/module_exit 52 * Adapted to module_init/module_exit
diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index f551233c5a08..583a3693df75 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -565,7 +565,7 @@ static int load_aica_firmware(void)
565 err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev); 565 err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev);
566 if (unlikely(err)) 566 if (unlikely(err))
567 return err; 567 return err;
568 /* write firware into memory */ 568 /* write firmware into memory */
569 spu_disable(); 569 spu_disable();
570 spu_memload(0, fw_entry->data, fw_entry->size); 570 spu_memload(0, fw_entry->data, fw_entry->size);
571 spu_enable(); 571 spu_enable();
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig
index 0a2f8f9eff53..811596f4c092 100644
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@ -42,7 +42,7 @@ config SND_BF5XX_AC97
42 You will also need to select the audio interfaces to support below. 42 You will also need to select the audio interfaces to support below.
43 43
44 Note: 44 Note:
45 AC97 codecs which do not implment the slot-16 mode will not function 45 AC97 codecs which do not implement the slot-16 mode will not function
46 properly with this driver. This driver is known to work with the 46 properly with this driver. This driver is known to work with the
47 Analog Devices line of AC97 codecs. 47 Analog Devices line of AC97 codecs.
48 48