aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
commita2013a13e68354e0c8f3696b69701803e13fb737 (patch)
treea7e1da6bfad1aa2afd83f401874d606269ce90b4 /lib
parentdadfab4873256d2145640c0ce468fcbfb48977fe (diff)
parent106f9d9337f65bd428c0c79f650e3489e458d771 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina: "Usual stuff -- comment/printk typo fixes, documentation updates, dead code elimination." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) HOWTO: fix double words typo x86 mtrr: fix comment typo in mtrr_bp_init propagate name change to comments in kernel source doc: Update the name of profiling based on sysfs treewide: Fix typos in various drivers treewide: Fix typos in various Kconfig wireless: mwifiex: Fix typo in wireless/mwifiex driver messages: i2o: Fix typo in messages/i2o scripts/kernel-doc: check that non-void fcts describe their return value Kernel-doc: Convention: Use a "Return" section to describe return values radeon: Fix typo and copy/paste error in comments doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c various: Fix spelling of "asynchronous" in comments. Fix misspellings of "whether" in comments. eisa: Fix spelling of "asynchronous". various: Fix spelling of "registered" in comments. doc: fix quite a few typos within Documentation target: iscsi: fix comment typos in target/iscsi drivers treewide: fix typo of "suport" in various comments and Kconfig treewide: fix typo of "suppport" in various comments ...
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug10
-rw-r--r--lib/bitmap.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 41faf0b8df1..e458782f3c5 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1115,7 +1115,7 @@ config NOTIFIER_ERROR_INJECTION
1115 depends on DEBUG_KERNEL 1115 depends on DEBUG_KERNEL
1116 select DEBUG_FS 1116 select DEBUG_FS
1117 help 1117 help
1118 This option provides the ability to inject artifical errors to 1118 This option provides the ability to inject artificial errors to
1119 specified notifier chain callbacks. It is useful to test the error 1119 specified notifier chain callbacks. It is useful to test the error
1120 handling of notifier call chain failures. 1120 handling of notifier call chain failures.
1121 1121
@@ -1126,7 +1126,7 @@ config CPU_NOTIFIER_ERROR_INJECT
1126 depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION 1126 depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION
1127 help 1127 help
1128 This option provides a kernel module that can be used to test 1128 This option provides a kernel module that can be used to test
1129 the error handling of the cpu notifiers by injecting artifical 1129 the error handling of the cpu notifiers by injecting artificial
1130 errors to CPU notifier chain callbacks. It is controlled through 1130 errors to CPU notifier chain callbacks. It is controlled through
1131 debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu 1131 debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu
1132 1132
@@ -1150,7 +1150,7 @@ config PM_NOTIFIER_ERROR_INJECT
1150 depends on PM && NOTIFIER_ERROR_INJECTION 1150 depends on PM && NOTIFIER_ERROR_INJECTION
1151 default m if PM_DEBUG 1151 default m if PM_DEBUG
1152 help 1152 help
1153 This option provides the ability to inject artifical errors to 1153 This option provides the ability to inject artificial errors to
1154 PM notifier chain callbacks. It is controlled through debugfs 1154 PM notifier chain callbacks. It is controlled through debugfs
1155 interface /sys/kernel/debug/notifier-error-inject/pm 1155 interface /sys/kernel/debug/notifier-error-inject/pm
1156 1156
@@ -1173,7 +1173,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT
1173 tristate "Memory hotplug notifier error injection module" 1173 tristate "Memory hotplug notifier error injection module"
1174 depends on MEMORY_HOTPLUG_SPARSE && NOTIFIER_ERROR_INJECTION 1174 depends on MEMORY_HOTPLUG_SPARSE && NOTIFIER_ERROR_INJECTION
1175 help 1175 help
1176 This option provides the ability to inject artifical errors to 1176 This option provides the ability to inject artificial errors to
1177 memory hotplug notifier chain callbacks. It is controlled through 1177 memory hotplug notifier chain callbacks. It is controlled through
1178 debugfs interface under /sys/kernel/debug/notifier-error-inject/memory 1178 debugfs interface under /sys/kernel/debug/notifier-error-inject/memory
1179 1179
@@ -1196,7 +1196,7 @@ config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
1196 tristate "pSeries reconfig notifier error injection module" 1196 tristate "pSeries reconfig notifier error injection module"
1197 depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION 1197 depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION
1198 help 1198 help
1199 This option provides the ability to inject artifical errors to 1199 This option provides the ability to inject artificial errors to
1200 pSeries reconfig notifier chain callbacks. It is controlled 1200 pSeries reconfig notifier chain callbacks. It is controlled
1201 through debugfs interface under 1201 through debugfs interface under
1202 /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/ 1202 /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 06fdfa1aeba..06f7e4fe8d2 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -353,7 +353,7 @@ again:
353EXPORT_SYMBOL(bitmap_find_next_zero_area); 353EXPORT_SYMBOL(bitmap_find_next_zero_area);
354 354
355/* 355/*
356 * Bitmap printing & parsing functions: first version by Bill Irwin, 356 * Bitmap printing & parsing functions: first version by Nadia Yvette Chambers,
357 * second version by Paul Jackson, third by Joe Korty. 357 * second version by Paul Jackson, third by Joe Korty.
358 */ 358 */
359 359