diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (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
...
181 files changed, 273 insertions, 240 deletions
diff --git a/Documentation/ABI/testing/dev-kmsg b/Documentation/ABI/testing/dev-kmsg index 7e7e07a82e0e..bb820be48179 100644 --- a/Documentation/ABI/testing/dev-kmsg +++ b/Documentation/ABI/testing/dev-kmsg | |||
@@ -92,7 +92,7 @@ Description: The /dev/kmsg character device node provides userspace access | |||
92 | The flags field carries '-' by default. A 'c' indicates a | 92 | The flags field carries '-' by default. A 'c' indicates a |
93 | fragment of a line. All following fragments are flagged with | 93 | fragment of a line. All following fragments are flagged with |
94 | '+'. Note, that these hints about continuation lines are not | 94 | '+'. Note, that these hints about continuation lines are not |
95 | neccessarily correct, and the stream could be interleaved with | 95 | necessarily correct, and the stream could be interleaved with |
96 | unrelated messages, but merging the lines in the output | 96 | unrelated messages, but merging the lines in the output |
97 | usually produces better human readable results. A similar | 97 | usually produces better human readable results. A similar |
98 | logic is used internally when messages are printed to the | 98 | logic is used internally when messages are printed to the |
diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power index 7fc2997b23a6..9d43e7670841 100644 --- a/Documentation/ABI/testing/sysfs-devices-power +++ b/Documentation/ABI/testing/sysfs-devices-power | |||
@@ -164,7 +164,7 @@ Contact: Rafael J. Wysocki <rjw@sisk.pl> | |||
164 | Description: | 164 | Description: |
165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute | 165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute |
166 | contains the total time the device has been preventing | 166 | contains the total time the device has been preventing |
167 | opportunistic transitions to sleep states from occuring. | 167 | opportunistic transitions to sleep states from occurring. |
168 | This attribute is read-only. If the device is not enabled to | 168 | This attribute is read-only. If the device is not enabled to |
169 | wake up the system from sleep states, this attribute is not | 169 | wake up the system from sleep states, this attribute is not |
170 | present. | 170 | present. |
diff --git a/Documentation/ABI/testing/sysfs-driver-ppi b/Documentation/ABI/testing/sysfs-driver-ppi index 97a003ee058b..7d1435bc976c 100644 --- a/Documentation/ABI/testing/sysfs-driver-ppi +++ b/Documentation/ABI/testing/sysfs-driver-ppi | |||
@@ -5,7 +5,7 @@ Contact: xiaoyan.zhang@intel.com | |||
5 | Description: | 5 | Description: |
6 | This folder includes the attributes related with PPI (Physical | 6 | This folder includes the attributes related with PPI (Physical |
7 | Presence Interface). Only if TPM is supported by BIOS, this | 7 | Presence Interface). Only if TPM is supported by BIOS, this |
8 | folder makes sence. The folder path can be got by command | 8 | folder makes sense. The folder path can be got by command |
9 | 'find /sys/ -name 'pcrs''. For the detail information of PPI, | 9 | 'find /sys/ -name 'pcrs''. For the detail information of PPI, |
10 | please refer to the PPI specification from | 10 | please refer to the PPI specification from |
11 | http://www.trustedcomputinggroup.org/ | 11 | http://www.trustedcomputinggroup.org/ |
diff --git a/Documentation/ABI/testing/sysfs-profiling b/Documentation/ABI/testing/sysfs-profiling index b02d8b8c173a..8a8e466eb2c0 100644 --- a/Documentation/ABI/testing/sysfs-profiling +++ b/Documentation/ABI/testing/sysfs-profiling | |||
@@ -1,13 +1,13 @@ | |||
1 | What: /sys/kernel/profile | 1 | What: /sys/kernel/profiling |
2 | Date: September 2008 | 2 | Date: September 2008 |
3 | Contact: Dave Hansen <dave@linux.vnet.ibm.com> | 3 | Contact: Dave Hansen <dave@linux.vnet.ibm.com> |
4 | Description: | 4 | Description: |
5 | /sys/kernel/profile is the runtime equivalent | 5 | /sys/kernel/profiling is the runtime equivalent |
6 | of the boot-time profile= option. | 6 | of the boot-time profile= option. |
7 | 7 | ||
8 | You can get the same effect running: | 8 | You can get the same effect running: |
9 | 9 | ||
10 | echo 2 > /sys/kernel/profile | 10 | echo 2 > /sys/kernel/profiling |
11 | 11 | ||
12 | as you would by issuing profile=2 on the boot | 12 | as you would by issuing profile=2 on the boot |
13 | command line. | 13 | command line. |
diff --git a/Documentation/HOWTO b/Documentation/HOWTO index 59c080f084ef..a9f288ff54f9 100644 --- a/Documentation/HOWTO +++ b/Documentation/HOWTO | |||
@@ -462,7 +462,7 @@ Differences between the kernel community and corporate structures | |||
462 | 462 | ||
463 | The kernel community works differently than most traditional corporate | 463 | The kernel community works differently than most traditional corporate |
464 | development environments. Here are a list of things that you can try to | 464 | development environments. Here are a list of things that you can try to |
465 | do to try to avoid problems: | 465 | do to avoid problems: |
466 | Good things to say regarding your proposed changes: | 466 | Good things to say regarding your proposed changes: |
467 | - "This solves multiple problems." | 467 | - "This solves multiple problems." |
468 | - "This deletes 2000 lines of code." | 468 | - "This deletes 2000 lines of code." |
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c index 6f706aca2049..f8ebcde43b17 100644 --- a/Documentation/accounting/getdelays.c +++ b/Documentation/accounting/getdelays.c | |||
@@ -51,7 +51,6 @@ int dbg; | |||
51 | int print_delays; | 51 | int print_delays; |
52 | int print_io_accounting; | 52 | int print_io_accounting; |
53 | int print_task_context_switch_counts; | 53 | int print_task_context_switch_counts; |
54 | __u64 stime, utime; | ||
55 | 54 | ||
56 | #define PRINTF(fmt, arg...) { \ | 55 | #define PRINTF(fmt, arg...) { \ |
57 | if (dbg) { \ | 56 | if (dbg) { \ |
diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt index ad86fb86c9a0..0188903bc9e1 100644 --- a/Documentation/dma-buf-sharing.txt +++ b/Documentation/dma-buf-sharing.txt | |||
@@ -376,7 +376,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases: | |||
376 | leaving the cpu domain and flushing caches at fault time. Note that all the | 376 | leaving the cpu domain and flushing caches at fault time. Note that all the |
377 | dma_buf files share the same anon inode, hence the exporter needs to replace | 377 | dma_buf files share the same anon inode, hence the exporter needs to replace |
378 | the dma_buf file stored in vma->vm_file with it's own if pte shootdown is | 378 | the dma_buf file stored in vma->vm_file with it's own if pte shootdown is |
379 | requred. This is because the kernel uses the underlying inode's address_space | 379 | required. This is because the kernel uses the underlying inode's address_space |
380 | for vma tracking (and hence pte tracking at shootdown time with | 380 | for vma tracking (and hence pte tracking at shootdown time with |
381 | unmap_mapping_range). | 381 | unmap_mapping_range). |
382 | 382 | ||
@@ -388,7 +388,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases: | |||
388 | Exporters that shoot down mappings (for any reasons) shall not do any | 388 | Exporters that shoot down mappings (for any reasons) shall not do any |
389 | synchronization at fault time with outstanding device operations. | 389 | synchronization at fault time with outstanding device operations. |
390 | Synchronization is an orthogonal issue to sharing the backing storage of a | 390 | Synchronization is an orthogonal issue to sharing the backing storage of a |
391 | buffer and hence should not be handled by dma-buf itself. This is explictly | 391 | buffer and hence should not be handled by dma-buf itself. This is explicitly |
392 | mentioned here because many people seem to want something like this, but if | 392 | mentioned here because many people seem to want something like this, but if |
393 | different exporters handle this differently, buffer sharing can fail in | 393 | different exporters handle this differently, buffer sharing can fail in |
394 | interesting ways depending upong the exporter (if userspace starts depending | 394 | interesting ways depending upong the exporter (if userspace starts depending |
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 74c25c8d8884..b89a739a3276 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
@@ -181,7 +181,6 @@ modversions.h* | |||
181 | nconf | 181 | nconf |
182 | ncscope.* | 182 | ncscope.* |
183 | offset.h | 183 | offset.h |
184 | offsets.h | ||
185 | oui.c* | 184 | oui.c* |
186 | page-types | 185 | page-types |
187 | parse.c | 186 | parse.c |
diff --git a/Documentation/fault-injection/notifier-error-inject.txt b/Documentation/fault-injection/notifier-error-inject.txt index c83526c364e5..09adabef513f 100644 --- a/Documentation/fault-injection/notifier-error-inject.txt +++ b/Documentation/fault-injection/notifier-error-inject.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | Notifier error injection | 1 | Notifier error injection |
2 | ======================== | 2 | ======================== |
3 | 3 | ||
4 | Notifier error injection provides the ability to inject artifical errors to | 4 | Notifier error injection provides the ability to inject artificial errors to |
5 | specified notifier chain callbacks. It is useful to test the error handling of | 5 | specified notifier chain callbacks. It is useful to test the error handling of |
6 | notifier call chain failures which is rarely executed. There are kernel | 6 | notifier call chain failures which is rarely executed. There are kernel |
7 | modules that can be used to test the following notifiers. | 7 | modules that can be used to test the following notifiers. |
@@ -14,7 +14,7 @@ modules that can be used to test the following notifiers. | |||
14 | CPU notifier error injection module | 14 | CPU notifier error injection module |
15 | ----------------------------------- | 15 | ----------------------------------- |
16 | This feature can be used to test the error handling of the CPU notifiers by | 16 | This feature can be used to test the error handling of the CPU notifiers by |
17 | injecting artifical errors to CPU notifier chain callbacks. | 17 | injecting artificial errors to CPU notifier chain callbacks. |
18 | 18 | ||
19 | If the notifier call chain should be failed with some events notified, write | 19 | If the notifier call chain should be failed with some events notified, write |
20 | the error code to debugfs interface | 20 | the error code to debugfs interface |
diff --git a/Documentation/hid/uhid.txt b/Documentation/hid/uhid.txt index 4627c4241ece..3c741214dfbb 100644 --- a/Documentation/hid/uhid.txt +++ b/Documentation/hid/uhid.txt | |||
@@ -108,7 +108,7 @@ the request was handled successfully. | |||
108 | UHID_FEATURE_ANSWER: | 108 | UHID_FEATURE_ANSWER: |
109 | If you receive a UHID_FEATURE request you must answer with this request. You | 109 | If you receive a UHID_FEATURE request you must answer with this request. You |
110 | must copy the "id" field from the request into the answer. Set the "err" field | 110 | must copy the "id" field from the request into the answer. Set the "err" field |
111 | to 0 if no error occured or to EIO if an I/O error occurred. | 111 | to 0 if no error occurred or to EIO if an I/O error occurred. |
112 | If "err" is 0 then you should fill the buffer of the answer with the results | 112 | If "err" is 0 then you should fill the buffer of the answer with the results |
113 | of the feature request and set "size" correspondingly. | 113 | of the feature request and set "size" correspondingly. |
114 | 114 | ||
diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus index f90f99920cc5..3d3a0f97f966 100644 --- a/Documentation/hwmon/pmbus +++ b/Documentation/hwmon/pmbus | |||
@@ -138,7 +138,7 @@ Sysfs entries | |||
138 | 138 | ||
139 | When probing the chip, the driver identifies which PMBus registers are | 139 | When probing the chip, the driver identifies which PMBus registers are |
140 | supported, and determines available sensors from this information. | 140 | supported, and determines available sensors from this information. |
141 | Attribute files only exist if respective sensors are suported by the chip. | 141 | Attribute files only exist if respective sensors are supported by the chip. |
142 | Labels are provided to inform the user about the sensor associated with | 142 | Labels are provided to inform the user about the sensor associated with |
143 | a given sysfs entry. | 143 | a given sysfs entry. |
144 | 144 | ||
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt index ae8ba9a74ce1..3262b6e4d686 100644 --- a/Documentation/input/alps.txt +++ b/Documentation/input/alps.txt | |||
@@ -133,7 +133,7 @@ number of contacts (f1 and f0 in the table below). | |||
133 | 133 | ||
134 | This packet only appears after a position packet with the mt bit set, and | 134 | This packet only appears after a position packet with the mt bit set, and |
135 | usually only appears when there are two or more contacts (although | 135 | usually only appears when there are two or more contacts (although |
136 | occassionally it's seen with only a single contact). | 136 | occasionally it's seen with only a single contact). |
137 | 137 | ||
138 | The final v3 packet type is the trackstick packet. | 138 | The final v3 packet type is the trackstick packet. |
139 | 139 | ||
diff --git a/Documentation/kbuild/modules.txt b/Documentation/kbuild/modules.txt index 3fb39e0116b4..69372fb98cf8 100644 --- a/Documentation/kbuild/modules.txt +++ b/Documentation/kbuild/modules.txt | |||
@@ -470,7 +470,7 @@ build. | |||
470 | 470 | ||
471 | Sometimes, an external module uses exported symbols from | 471 | Sometimes, an external module uses exported symbols from |
472 | another external module. kbuild needs to have full knowledge of | 472 | another external module. kbuild needs to have full knowledge of |
473 | all symbols to avoid spitting out warnings about undefined | 473 | all symbols to avoid spliitting out warnings about undefined |
474 | symbols. Three solutions exist for this situation. | 474 | symbols. Three solutions exist for this situation. |
475 | 475 | ||
476 | NOTE: The method with a top-level kbuild file is recommended | 476 | NOTE: The method with a top-level kbuild file is recommended |
diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt index 3d8a97747f77..99b57abddf8a 100644 --- a/Documentation/kernel-doc-nano-HOWTO.txt +++ b/Documentation/kernel-doc-nano-HOWTO.txt | |||
@@ -64,6 +64,8 @@ Example kernel-doc function comment: | |||
64 | * comment lines. | 64 | * comment lines. |
65 | * | 65 | * |
66 | * The longer description can have multiple paragraphs. | 66 | * The longer description can have multiple paragraphs. |
67 | * | ||
68 | * Return: Describe the return value of foobar. | ||
67 | */ | 69 | */ |
68 | 70 | ||
69 | The short description following the subject can span multiple lines | 71 | The short description following the subject can span multiple lines |
@@ -78,6 +80,8 @@ If a function parameter is "..." (varargs), it should be listed in | |||
78 | kernel-doc notation as: | 80 | kernel-doc notation as: |
79 | * @...: description | 81 | * @...: description |
80 | 82 | ||
83 | The return value, if any, should be described in a dedicated section | ||
84 | named "Return". | ||
81 | 85 | ||
82 | Example kernel-doc data structure comment. | 86 | Example kernel-doc data structure comment. |
83 | 87 | ||
@@ -222,6 +226,9 @@ only a "*"). | |||
222 | "section header:" names must be unique per function (or struct, | 226 | "section header:" names must be unique per function (or struct, |
223 | union, typedef, enum). | 227 | union, typedef, enum). |
224 | 228 | ||
229 | Use the section header "Return" for sections describing the return value | ||
230 | of a function. | ||
231 | |||
225 | Avoid putting a spurious blank line after the function name, or else the | 232 | Avoid putting a spurious blank line after the function name, or else the |
226 | description will be repeated! | 233 | description will be repeated! |
227 | 234 | ||
@@ -237,21 +244,21 @@ patterns, which are highlighted appropriately. | |||
237 | NOTE 1: The multi-line descriptive text you provide does *not* recognize | 244 | NOTE 1: The multi-line descriptive text you provide does *not* recognize |
238 | line breaks, so if you try to format some text nicely, as in: | 245 | line breaks, so if you try to format some text nicely, as in: |
239 | 246 | ||
240 | Return codes | 247 | Return: |
241 | 0 - cool | 248 | 0 - cool |
242 | 1 - invalid arg | 249 | 1 - invalid arg |
243 | 2 - out of memory | 250 | 2 - out of memory |
244 | 251 | ||
245 | this will all run together and produce: | 252 | this will all run together and produce: |
246 | 253 | ||
247 | Return codes 0 - cool 1 - invalid arg 2 - out of memory | 254 | Return: 0 - cool 1 - invalid arg 2 - out of memory |
248 | 255 | ||
249 | NOTE 2: If the descriptive text you provide has lines that begin with | 256 | NOTE 2: If the descriptive text you provide has lines that begin with |
250 | some phrase followed by a colon, each of those phrases will be taken as | 257 | some phrase followed by a colon, each of those phrases will be taken as |
251 | a new section heading, which means you should similarly try to avoid text | 258 | a new section heading, which means you should similarly try to avoid text |
252 | like: | 259 | like: |
253 | 260 | ||
254 | Return codes: | 261 | Return: |
255 | 0: cool | 262 | 0: cool |
256 | 1: invalid arg | 263 | 1: invalid arg |
257 | 2: out of memory | 264 | 2: out of memory |
diff --git a/Documentation/misc-devices/mei/mei-amt-version.c b/Documentation/misc-devices/mei/mei-amt-version.c index 01804f216312..49e4f770864a 100644 --- a/Documentation/misc-devices/mei/mei-amt-version.c +++ b/Documentation/misc-devices/mei/mei-amt-version.c | |||
@@ -214,7 +214,7 @@ out: | |||
214 | } | 214 | } |
215 | 215 | ||
216 | /*************************************************************************** | 216 | /*************************************************************************** |
217 | * Intel Advanced Management Technolgy ME Client | 217 | * Intel Advanced Management Technology ME Client |
218 | ***************************************************************************/ | 218 | ***************************************************************************/ |
219 | 219 | ||
220 | #define AMT_MAJOR_VERSION 1 | 220 | #define AMT_MAJOR_VERSION 1 |
@@ -256,7 +256,7 @@ struct amt_code_versions { | |||
256 | } __attribute__((packed)); | 256 | } __attribute__((packed)); |
257 | 257 | ||
258 | /*************************************************************************** | 258 | /*************************************************************************** |
259 | * Intel Advanced Management Technolgy Host Interface | 259 | * Intel Advanced Management Technology Host Interface |
260 | ***************************************************************************/ | 260 | ***************************************************************************/ |
261 | 261 | ||
262 | struct amt_host_if_msg_header { | 262 | struct amt_host_if_msg_header { |
diff --git a/Documentation/video4linux/bttv/Cards b/Documentation/video4linux/bttv/Cards index db833ced2cb8..a8fb6e2d3c8b 100644 --- a/Documentation/video4linux/bttv/Cards +++ b/Documentation/video4linux/bttv/Cards | |||
@@ -43,7 +43,7 @@ Very nice card if you only have satellite TV but several tuners connected | |||
43 | to the card via composite. | 43 | to the card via composite. |
44 | 44 | ||
45 | Many thanks to Matrix-Vision for giving us 2 cards for free which made | 45 | Many thanks to Matrix-Vision for giving us 2 cards for free which made |
46 | Bt848a/Bt849 single crytal operation support possible!!! | 46 | Bt848a/Bt849 single crystal operation support possible!!! |
47 | 47 | ||
48 | 48 | ||
49 | 49 | ||
diff --git a/Documentation/video4linux/bttv/Sound-FAQ b/Documentation/video4linux/bttv/Sound-FAQ index 395f6c6fdd98..d3f1d7783d1c 100644 --- a/Documentation/video4linux/bttv/Sound-FAQ +++ b/Documentation/video4linux/bttv/Sound-FAQ | |||
@@ -82,7 +82,7 @@ card installed, you might to check out if you can read these registers | |||
82 | values used by the windows driver. A tool to do this is available | 82 | values used by the windows driver. A tool to do this is available |
83 | from ftp://telepresence.dmem.strath.ac.uk/pub/bt848/winutil, but it | 83 | from ftp://telepresence.dmem.strath.ac.uk/pub/bt848/winutil, but it |
84 | does'nt work with bt878 boards according to some reports I received. | 84 | does'nt work with bt878 boards according to some reports I received. |
85 | Another one with bt878 suport is available from | 85 | Another one with bt878 support is available from |
86 | http://btwincap.sourceforge.net/Files/btspy2.00.zip | 86 | http://btwincap.sourceforge.net/Files/btspy2.00.zip |
87 | 87 | ||
88 | You might also dig around in the *.ini files of the Windows applications. | 88 | You might also dig around in the *.ini files of the Windows applications. |
diff --git a/Documentation/vm/frontswap.txt b/Documentation/vm/frontswap.txt index 5ef2d1366425..c71a019be600 100644 --- a/Documentation/vm/frontswap.txt +++ b/Documentation/vm/frontswap.txt | |||
@@ -193,7 +193,7 @@ faster. | |||
193 | or maybe swap-over-nbd/NFS)? | 193 | or maybe swap-over-nbd/NFS)? |
194 | 194 | ||
195 | No. First, the existing swap subsystem doesn't allow for any kind of | 195 | No. First, the existing swap subsystem doesn't allow for any kind of |
196 | swap hierarchy. Perhaps it could be rewritten to accomodate a hierarchy, | 196 | swap hierarchy. Perhaps it could be rewritten to accommodate a hierarchy, |
197 | but this would require fairly drastic changes. Even if it were | 197 | but this would require fairly drastic changes. Even if it were |
198 | rewritten, the existing swap subsystem uses the block I/O layer which | 198 | rewritten, the existing swap subsystem uses the block I/O layer which |
199 | assumes a swap device is fixed size and any page in it is linearly | 199 | assumes a swap device is fixed size and any page in it is linearly |
diff --git a/MAINTAINERS b/MAINTAINERS index 0bc485c4a88e..b0b880da6e5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3596,7 +3596,7 @@ S: Maintained | |||
3596 | F: drivers/input/touchscreen/htcpen.c | 3596 | F: drivers/input/touchscreen/htcpen.c |
3597 | 3597 | ||
3598 | HUGETLB FILESYSTEM | 3598 | HUGETLB FILESYSTEM |
3599 | M: William Irwin <wli@holomorphy.com> | 3599 | M: Nadia Yvette Chambers <nyc@holomorphy.com> |
3600 | S: Maintained | 3600 | S: Maintained |
3601 | F: fs/hugetlbfs/ | 3601 | F: fs/hugetlbfs/ |
3602 | 3602 | ||
@@ -180,6 +180,10 @@ CONFIGURING the kernel: | |||
180 | with questions already answered. | 180 | with questions already answered. |
181 | Additionally updates the dependencies. | 181 | Additionally updates the dependencies. |
182 | 182 | ||
183 | "make olddefconfig" | ||
184 | Like above, but sets new symbols to their default | ||
185 | values without prompting. | ||
186 | |||
183 | "make defconfig" Create a ./.config file by using the default | 187 | "make defconfig" Create a ./.config file by using the default |
184 | symbol values from either arch/$ARCH/defconfig | 188 | symbol values from either arch/$ARCH/defconfig |
185 | or arch/$ARCH/configs/${PLATFORM}_defconfig, | 189 | or arch/$ARCH/configs/${PLATFORM}_defconfig, |
diff --git a/arch/alpha/include/asm/mmzone.h b/arch/alpha/include/asm/mmzone.h index 445dc42e0334..c5b5d6bac9ed 100644 --- a/arch/alpha/include/asm/mmzone.h +++ b/arch/alpha/include/asm/mmzone.h | |||
@@ -66,7 +66,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n) | |||
66 | ((unsigned long)__va(NODE_DATA(kvaddr_to_nid(kaddr))->node_start_pfn \ | 66 | ((unsigned long)__va(NODE_DATA(kvaddr_to_nid(kaddr))->node_start_pfn \ |
67 | << PAGE_SHIFT)) | 67 | << PAGE_SHIFT)) |
68 | 68 | ||
69 | /* XXX: FIXME -- wli */ | 69 | /* XXX: FIXME -- nyc */ |
70 | #define kern_addr_valid(kaddr) (0) | 70 | #define kern_addr_valid(kaddr) (0) |
71 | 71 | ||
72 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) | 72 | #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) |
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 3f844d26d2c7..a21d0ab3b19e 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c | |||
@@ -354,8 +354,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page, | |||
354 | struct pci_dev *pdev = alpha_gendev_to_pci(dev); | 354 | struct pci_dev *pdev = alpha_gendev_to_pci(dev); |
355 | int dac_allowed; | 355 | int dac_allowed; |
356 | 356 | ||
357 | if (dir == PCI_DMA_NONE) | 357 | BUG_ON(dir == PCI_DMA_NONE); |
358 | BUG(); | ||
359 | 358 | ||
360 | dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; | 359 | dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; |
361 | return pci_map_single_1(pdev, (char *)page_address(page) + offset, | 360 | return pci_map_single_1(pdev, (char *)page_address(page) + offset, |
@@ -378,8 +377,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, | |||
378 | struct pci_iommu_arena *arena; | 377 | struct pci_iommu_arena *arena; |
379 | long dma_ofs, npages; | 378 | long dma_ofs, npages; |
380 | 379 | ||
381 | if (dir == PCI_DMA_NONE) | 380 | BUG_ON(dir == PCI_DMA_NONE); |
382 | BUG(); | ||
383 | 381 | ||
384 | if (dma_addr >= __direct_map_base | 382 | if (dma_addr >= __direct_map_base |
385 | && dma_addr < __direct_map_base + __direct_map_size) { | 383 | && dma_addr < __direct_map_base + __direct_map_size) { |
@@ -662,8 +660,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, | |||
662 | dma_addr_t max_dma; | 660 | dma_addr_t max_dma; |
663 | int dac_allowed; | 661 | int dac_allowed; |
664 | 662 | ||
665 | if (dir == PCI_DMA_NONE) | 663 | BUG_ON(dir == PCI_DMA_NONE); |
666 | BUG(); | ||
667 | 664 | ||
668 | dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; | 665 | dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; |
669 | 666 | ||
@@ -742,8 +739,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg, | |||
742 | dma_addr_t max_dma; | 739 | dma_addr_t max_dma; |
743 | dma_addr_t fbeg, fend; | 740 | dma_addr_t fbeg, fend; |
744 | 741 | ||
745 | if (dir == PCI_DMA_NONE) | 742 | BUG_ON(dir == PCI_DMA_NONE); |
746 | BUG(); | ||
747 | 743 | ||
748 | if (! alpha_mv.mv_pci_tbi) | 744 | if (! alpha_mv.mv_pci_tbi) |
749 | return; | 745 | return; |
diff --git a/arch/arm/kernel/kprobes-test.c b/arch/arm/kernel/kprobes-test.c index 1862d8f2fd44..0cd63d080c7b 100644 --- a/arch/arm/kernel/kprobes-test.c +++ b/arch/arm/kernel/kprobes-test.c | |||
@@ -1598,7 +1598,7 @@ static int __init run_all_tests(void) | |||
1598 | { | 1598 | { |
1599 | int ret = 0; | 1599 | int ret = 0; |
1600 | 1600 | ||
1601 | pr_info("Begining kprobe tests...\n"); | 1601 | pr_info("Beginning kprobe tests...\n"); |
1602 | 1602 | ||
1603 | #ifndef CONFIG_THUMB2_KERNEL | 1603 | #ifndef CONFIG_THUMB2_KERNEL |
1604 | 1604 | ||
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index e4cfb7e5361d..f1c972d87bac 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c | |||
@@ -136,7 +136,7 @@ int xc_request_firmware(struct xc *x) | |||
136 | if (head->magic != 0x4e657458) { | 136 | if (head->magic != 0x4e657458) { |
137 | if (head->magic == 0x5874654e) { | 137 | if (head->magic == 0x5874654e) { |
138 | dev_err(x->dev, | 138 | dev_err(x->dev, |
139 | "firmware magic is 'XteN'. Endianess problems?\n"); | 139 | "firmware magic is 'XteN'. Endianness problems?\n"); |
140 | ret = -ENODEV; | 140 | ret = -ENODEV; |
141 | goto exit_release_firmware; | 141 | goto exit_release_firmware; |
142 | } | 142 | } |
diff --git a/arch/arm/mach-s3c24xx/include/mach/bast-map.h b/arch/arm/mach-s3c24xx/include/mach/bast-map.h index 6e7dc9d0cf0e..eecea2a50f8f 100644 --- a/arch/arm/mach-s3c24xx/include/mach/bast-map.h +++ b/arch/arm/mach-s3c24xx/include/mach/bast-map.h | |||
@@ -74,7 +74,7 @@ | |||
74 | 74 | ||
75 | 75 | ||
76 | /* 0xE0000000 contains the IO space that is split by speed and | 76 | /* 0xE0000000 contains the IO space that is split by speed and |
77 | * wether the access is for 8 or 16bit IO... this ensures that | 77 | * whether the access is for 8 or 16bit IO... this ensures that |
78 | * the correct access is made | 78 | * the correct access is made |
79 | * | 79 | * |
80 | * 0x10000000 of space, partitioned as so: | 80 | * 0x10000000 of space, partitioned as so: |
diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h index ee99fd56c043..6b72d5a4b377 100644 --- a/arch/arm/mach-s3c24xx/include/mach/dma.h +++ b/arch/arm/mach-s3c24xx/include/mach/dma.h | |||
@@ -88,7 +88,7 @@ enum s3c2410_dma_state { | |||
88 | * | 88 | * |
89 | * This represents the state of the DMA engine, wrt to the loaded / running | 89 | * This represents the state of the DMA engine, wrt to the loaded / running |
90 | * transfers. Since we don't have any way of knowing exactly the state of | 90 | * transfers. Since we don't have any way of knowing exactly the state of |
91 | * the DMA transfers, we need to know the state to make decisions on wether | 91 | * the DMA transfers, we need to know the state to make decisions on whether |
92 | * we can | 92 | * we can |
93 | * | 93 | * |
94 | * S3C2410_DMA_NONE | 94 | * S3C2410_DMA_NONE |
diff --git a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h index 99612fcc4eb2..28376e56dd3b 100644 --- a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h +++ b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | |||
@@ -51,7 +51,7 @@ | |||
51 | #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) | 51 | #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) |
52 | 52 | ||
53 | /* 0xE0000000 contains the IO space that is split by speed and | 53 | /* 0xE0000000 contains the IO space that is split by speed and |
54 | * wether the access is for 8 or 16bit IO... this ensures that | 54 | * whether the access is for 8 or 16bit IO... this ensures that |
55 | * the correct access is made | 55 | * the correct access is made |
56 | * | 56 | * |
57 | * 0x10000000 of space, partitioned as so: | 57 | * 0x10000000 of space, partitioned as so: |
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c index 60627e63a254..724755f0b0f5 100644 --- a/arch/arm/mach-s3c24xx/pm.c +++ b/arch/arm/mach-s3c24xx/pm.c | |||
@@ -121,7 +121,7 @@ void s3c_pm_configure_extint(void) | |||
121 | int pin; | 121 | int pin; |
122 | 122 | ||
123 | /* for each of the external interrupts (EINT0..EINT15) we | 123 | /* for each of the external interrupts (EINT0..EINT15) we |
124 | * need to check wether it is an external interrupt source, | 124 | * need to check whether it is an external interrupt source, |
125 | * and then configure it as an input if it is not | 125 | * and then configure it as an input if it is not |
126 | */ | 126 | */ |
127 | 127 | ||
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index e426d1b7747e..b442f15fd01a 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -55,7 +55,7 @@ config TEGRA_AHB | |||
55 | help | 55 | help |
56 | Adds AHB configuration functionality for NVIDIA Tegra SoCs, | 56 | Adds AHB configuration functionality for NVIDIA Tegra SoCs, |
57 | which controls AHB bus master arbitration and some | 57 | which controls AHB bus master arbitration and some |
58 | perfomance parameters(priority, prefech size). | 58 | performance parameters(priority, prefech size). |
59 | 59 | ||
60 | config TEGRA_EMC_SCALING_ENABLE | 60 | config TEGRA_EMC_SCALING_ENABLE |
61 | bool "Enable scaling the memory frequency" | 61 | bool "Enable scaling the memory frequency" |
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 0abd1c469887..ba3e76c95504 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
@@ -325,7 +325,7 @@ static int s3c2410_dma_start(struct s3c2410_dma_chan *chan) | |||
325 | 325 | ||
326 | chan->state = S3C2410_DMA_RUNNING; | 326 | chan->state = S3C2410_DMA_RUNNING; |
327 | 327 | ||
328 | /* check wether there is anything to load, and if not, see | 328 | /* check whether there is anything to load, and if not, see |
329 | * if we can find anything to load | 329 | * if we can find anything to load |
330 | */ | 330 | */ |
331 | 331 | ||
diff --git a/arch/blackfin/mach-bf609/Kconfig b/arch/blackfin/mach-bf609/Kconfig index 101b33ee9bba..95a4f1b676ce 100644 --- a/arch/blackfin/mach-bf609/Kconfig +++ b/arch/blackfin/mach-bf609/Kconfig | |||
@@ -56,7 +56,7 @@ config SEC_IRQ_PRIORITY_LEVELS | |||
56 | default 7 | 56 | default 7 |
57 | range 0 7 | 57 | range 0 7 |
58 | help | 58 | help |
59 | Devide the total number of interrupt priority levels into sub-levels. | 59 | Divide the total number of interrupt priority levels into sub-levels. |
60 | There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels. | 60 | There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels. |
61 | 61 | ||
62 | endmenu | 62 | endmenu |
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c index 342e378da1ec..1f3b3ef3e103 100644 --- a/arch/blackfin/mm/sram-alloc.c +++ b/arch/blackfin/mm/sram-alloc.c | |||
@@ -191,7 +191,7 @@ static irqreturn_t l2_ecc_err(int irq, void *dev_id) | |||
191 | { | 191 | { |
192 | int status; | 192 | int status; |
193 | 193 | ||
194 | printk(KERN_ERR "L2 ecc error happend\n"); | 194 | printk(KERN_ERR "L2 ecc error happened\n"); |
195 | status = bfin_read32(L2CTL0_STAT); | 195 | status = bfin_read32(L2CTL0_STAT); |
196 | if (status & 0x1) | 196 | if (status & 0x1) |
197 | printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", | 197 | printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", |
diff --git a/arch/cris/include/arch-v10/arch/irq.h b/arch/cris/include/arch-v10/arch/irq.h index 7d345947b3ee..ca2675ae08ed 100644 --- a/arch/cris/include/arch-v10/arch/irq.h +++ b/arch/cris/include/arch-v10/arch/irq.h | |||
@@ -142,7 +142,7 @@ __asm__ ( \ | |||
142 | * it here, we would not get the multiple_irq at all. | 142 | * it here, we would not get the multiple_irq at all. |
143 | * | 143 | * |
144 | * The non-blocking here is based on the knowledge that the timer interrupt is | 144 | * The non-blocking here is based on the knowledge that the timer interrupt is |
145 | * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not | 145 | * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not |
146 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. | 146 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. |
147 | */ | 147 | */ |
148 | 148 | ||
diff --git a/arch/cris/include/arch-v32/arch/irq.h b/arch/cris/include/arch-v32/arch/irq.h index b31e9984f849..fe3cdd22bed4 100644 --- a/arch/cris/include/arch-v32/arch/irq.h +++ b/arch/cris/include/arch-v32/arch/irq.h | |||
@@ -103,7 +103,7 @@ __asm__ ( \ | |||
103 | * if we had BLOCK'edit here, we would not get the multiple_irq at all. | 103 | * if we had BLOCK'edit here, we would not get the multiple_irq at all. |
104 | * | 104 | * |
105 | * The non-blocking here is based on the knowledge that the timer interrupt is | 105 | * The non-blocking here is based on the knowledge that the timer interrupt is |
106 | * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not | 106 | * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not |
107 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. | 107 | * be an sti() before the timer irq handler is run to acknowledge the interrupt. |
108 | */ | 108 | */ |
109 | #define BUILD_TIMER_IRQ(nr, mask) \ | 109 | #define BUILD_TIMER_IRQ(nr, mask) \ |
diff --git a/arch/frv/mm/pgalloc.c b/arch/frv/mm/pgalloc.c index 4fb63a36bd52..f6084bc524e8 100644 --- a/arch/frv/mm/pgalloc.c +++ b/arch/frv/mm/pgalloc.c | |||
@@ -77,7 +77,7 @@ void __set_pmd(pmd_t *pmdptr, unsigned long pmd) | |||
77 | * checks at dup_mmap(), exec(), and other mmlist addition points | 77 | * checks at dup_mmap(), exec(), and other mmlist addition points |
78 | * could be used. The locking scheme was chosen on the basis of | 78 | * could be used. The locking scheme was chosen on the basis of |
79 | * manfred's recommendations and having no core impact whatsoever. | 79 | * manfred's recommendations and having no core impact whatsoever. |
80 | * -- wli | 80 | * -- nyc |
81 | */ | 81 | */ |
82 | DEFINE_SPINLOCK(pgd_lock); | 82 | DEFINE_SPINLOCK(pgd_lock); |
83 | struct page *pgd_list; | 83 | struct page *pgd_list; |
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 8b3a9c0e771d..0a88cb5d316d 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * kvm_ia64.c: Basic KVM suppport On Itanium series processors | 2 | * kvm_ia64.c: Basic KVM support On Itanium series processors |
3 | * | 3 | * |
4 | * | 4 | * |
5 | * Copyright (C) 2007, Intel Corporation. | 5 | * Copyright (C) 2007, Intel Corporation. |
diff --git a/arch/m68k/math-emu/fp_log.c b/arch/m68k/math-emu/fp_log.c index 3384a5244fbd..0663067870f2 100644 --- a/arch/m68k/math-emu/fp_log.c +++ b/arch/m68k/math-emu/fp_log.c | |||
@@ -50,7 +50,7 @@ fp_fsqrt(struct fp_ext *dest, struct fp_ext *src) | |||
50 | * sqrt(m*2^e) = | 50 | * sqrt(m*2^e) = |
51 | * sqrt(2*m) * 2^(p) , if e = 2*p + 1 | 51 | * sqrt(2*m) * 2^(p) , if e = 2*p + 1 |
52 | * | 52 | * |
53 | * So we use the last bit of the exponent to decide wether to | 53 | * So we use the last bit of the exponent to decide whether to |
54 | * use the m or 2*m. | 54 | * use the m or 2*m. |
55 | * | 55 | * |
56 | * Since only the fractional part of the mantissa is stored and | 56 | * Since only the fractional part of the mantissa is stored and |
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c index 4efd9185f294..b14ee53581a9 100644 --- a/arch/mips/txx9/generic/pci.c +++ b/arch/mips/txx9/generic/pci.c | |||
@@ -341,7 +341,7 @@ static void __devinit quirk_slc90e66_ide(struct pci_dev *dev) | |||
341 | 341 | ||
342 | static void __devinit tc35815_fixup(struct pci_dev *dev) | 342 | static void __devinit tc35815_fixup(struct pci_dev *dev) |
343 | { | 343 | { |
344 | /* This device may have PM registers but not they are not suported. */ | 344 | /* This device may have PM registers but not they are not supported. */ |
345 | if (dev->pm_cap) { | 345 | if (dev->pm_cap) { |
346 | dev_info(&dev->dev, "PM disabled\n"); | 346 | dev_info(&dev->dev, "PM disabled\n"); |
347 | dev->pm_cap = 0; | 347 | dev->pm_cap = 0; |
diff --git a/arch/mn10300/mm/pgtable.c b/arch/mn10300/mm/pgtable.c index 4ebf117c3285..bd9ada693f95 100644 --- a/arch/mn10300/mm/pgtable.c +++ b/arch/mn10300/mm/pgtable.c | |||
@@ -95,7 +95,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
95 | * checks at dup_mmap(), exec(), and other mmlist addition points | 95 | * checks at dup_mmap(), exec(), and other mmlist addition points |
96 | * could be used. The locking scheme was chosen on the basis of | 96 | * could be used. The locking scheme was chosen on the basis of |
97 | * manfred's recommendations and having no core impact whatsoever. | 97 | * manfred's recommendations and having no core impact whatsoever. |
98 | * -- wli | 98 | * -- nyc |
99 | */ | 99 | */ |
100 | DEFINE_SPINLOCK(pgd_lock); | 100 | DEFINE_SPINLOCK(pgd_lock); |
101 | struct page *pgd_list; | 101 | struct page *pgd_list; |
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index e7f1a2993f78..ec37e185d20d 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig | |||
@@ -146,7 +146,7 @@ config DEBUG_STACKOVERFLOW | |||
146 | help | 146 | help |
147 | Make extra checks for space available on stack in some | 147 | Make extra checks for space available on stack in some |
148 | critical functions. This will cause kernel to run a bit slower, | 148 | critical functions. This will cause kernel to run a bit slower, |
149 | but will catch most of kernel stack overruns and exit gracefuly. | 149 | but will catch most of kernel stack overruns and exit gracefully. |
150 | 150 | ||
151 | Say Y if you are unsure. | 151 | Say Y if you are unsure. |
152 | 152 | ||
diff --git a/arch/powerpc/include/asm/oprofile_impl.h b/arch/powerpc/include/asm/oprofile_impl.h index 639dc96077ab..d697b08994c9 100644 --- a/arch/powerpc/include/asm/oprofile_impl.h +++ b/arch/powerpc/include/asm/oprofile_impl.h | |||
@@ -34,7 +34,7 @@ struct op_system_config { | |||
34 | unsigned long mmcra; | 34 | unsigned long mmcra; |
35 | #ifdef CONFIG_OPROFILE_CELL | 35 | #ifdef CONFIG_OPROFILE_CELL |
36 | /* Register for oprofile user tool to check cell kernel profiling | 36 | /* Register for oprofile user tool to check cell kernel profiling |
37 | * suport. | 37 | * support. |
38 | */ | 38 | */ |
39 | unsigned long cell_support; | 39 | unsigned long cell_support; |
40 | #endif | 40 | #endif |
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h index eedf427c9124..3e13e23e4fdf 100644 --- a/arch/powerpc/include/asm/pte-hash64-64k.h +++ b/arch/powerpc/include/asm/pte-hash64-64k.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | /* Note the full page bits must be in the same location as for normal | 24 | /* Note the full page bits must be in the same location as for normal |
25 | * 4k pages as the same assembly will be used to insert 64K pages | 25 | * 4k pages as the same assembly will be used to insert 64K pages |
26 | * wether the kernel has CONFIG_PPC_64K_PAGES or not | 26 | * whether the kernel has CONFIG_PPC_64K_PAGES or not |
27 | */ | 27 | */ |
28 | #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ | 28 | #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ |
29 | #define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */ | 29 | #define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */ |
diff --git a/arch/powerpc/include/asm/smu.h b/arch/powerpc/include/asm/smu.h index ae20ce1af4c7..6e909f3e6a46 100644 --- a/arch/powerpc/include/asm/smu.h +++ b/arch/powerpc/include/asm/smu.h | |||
@@ -132,7 +132,7 @@ | |||
132 | * | 132 | * |
133 | * At this point, the OF driver seems to have a limitation on transfer | 133 | * At this point, the OF driver seems to have a limitation on transfer |
134 | * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know | 134 | * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know |
135 | * wether this is just an OF limit due to some temporary buffer size | 135 | * whether this is just an OF limit due to some temporary buffer size |
136 | * or if this is an SMU imposed limit. This driver has the same limitation | 136 | * or if this is an SMU imposed limit. This driver has the same limitation |
137 | * for now as I use a 0x10 bytes temporary buffer as well | 137 | * for now as I use a 0x10 bytes temporary buffer as well |
138 | * | 138 | * |
@@ -236,7 +236,7 @@ | |||
236 | * 3 (optional): enable nmi? [0x00 or 0x01] | 236 | * 3 (optional): enable nmi? [0x00 or 0x01] |
237 | * | 237 | * |
238 | * Returns: | 238 | * Returns: |
239 | * If parameter 2 is 0x00 and parameter 3 is not specified, returns wether | 239 | * If parameter 2 is 0x00 and parameter 3 is not specified, returns whether |
240 | * NMI is enabled. Otherwise unknown. | 240 | * NMI is enabled. Otherwise unknown. |
241 | */ | 241 | */ |
242 | #define SMU_CMD_MISC_df_NMI_OPTION 0x04 | 242 | #define SMU_CMD_MISC_df_NMI_OPTION 0x04 |
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index bedd12e1cfbc..0733b05eb856 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
@@ -387,7 +387,7 @@ void __init find_legacy_serial_ports(void) | |||
387 | of_node_put(parent); | 387 | of_node_put(parent); |
388 | continue; | 388 | continue; |
389 | } | 389 | } |
390 | /* Check for known pciclass, and also check wether we have | 390 | /* Check for known pciclass, and also check whether we have |
391 | * a device with child nodes for ports or not | 391 | * a device with child nodes for ports or not |
392 | */ | 392 | */ |
393 | if (of_device_is_compatible(np, "pciclass,0700") || | 393 | if (of_device_is_compatible(np, "pciclass,0700") || |
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 2049f2d00ffe..9db8ec07ec94 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
@@ -82,7 +82,7 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev) | |||
82 | return -ENXIO; | 82 | return -ENXIO; |
83 | 83 | ||
84 | /* Claim resources. This might need some rework as well depending | 84 | /* Claim resources. This might need some rework as well depending |
85 | * wether we are doing probe-only or not, like assigning unassigned | 85 | * whether we are doing probe-only or not, like assigning unassigned |
86 | * resources etc... | 86 | * resources etc... |
87 | */ | 87 | */ |
88 | pcibios_claim_one_bus(phb->bus); | 88 | pcibios_claim_one_bus(phb->bus); |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index d183f8719a50..1ca045d44324 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -83,7 +83,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
83 | * the context). This is very important because we must ensure we | 83 | * the context). This is very important because we must ensure we |
84 | * don't lose the VRSAVE content that may have been set prior to | 84 | * don't lose the VRSAVE content that may have been set prior to |
85 | * the process doing its first vector operation | 85 | * the process doing its first vector operation |
86 | * Userland shall check AT_HWCAP to know wether it can rely on the | 86 | * Userland shall check AT_HWCAP to know whether it can rely on the |
87 | * v_regs pointer or not | 87 | * v_regs pointer or not |
88 | */ | 88 | */ |
89 | #ifdef CONFIG_ALTIVEC | 89 | #ifdef CONFIG_ALTIVEC |
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c index 5829d2a950d4..cf9dada734b6 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/slice.c | |||
@@ -722,7 +722,7 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start, | |||
722 | } | 722 | } |
723 | 723 | ||
724 | /* | 724 | /* |
725 | * is_hugepage_only_range() is used by generic code to verify wether | 725 | * is_hugepage_only_range() is used by generic code to verify whether |
726 | * a normal mmap mapping (non hugetlbfs) is valid on a given area. | 726 | * a normal mmap mapping (non hugetlbfs) is valid on a given area. |
727 | * | 727 | * |
728 | * until the generic code provides a more generic hook and/or starts | 728 | * until the generic code provides a more generic hook and/or starts |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c index 028470b95886..a51cb07bd663 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c | |||
@@ -526,7 +526,7 @@ EXPORT_SYMBOL(mpc52xx_gpt_timer_period); | |||
526 | 526 | ||
527 | #define WDT_IDENTITY "mpc52xx watchdog on GPT0" | 527 | #define WDT_IDENTITY "mpc52xx watchdog on GPT0" |
528 | 528 | ||
529 | /* wdt_is_active stores wether or not the /dev/watchdog device is opened */ | 529 | /* wdt_is_active stores whether or not the /dev/watchdog device is opened */ |
530 | static unsigned long wdt_is_active; | 530 | static unsigned long wdt_is_active; |
531 | 531 | ||
532 | /* wdt-capable gpt */ | 532 | /* wdt-capable gpt */ |
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index dca213666747..e56bb651da1a 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -728,7 +728,7 @@ static struct cbe_iommu * __init cell_iommu_alloc(struct device_node *np) | |||
728 | nid, np->full_name); | 728 | nid, np->full_name); |
729 | 729 | ||
730 | /* XXX todo: If we can have multiple windows on the same IOMMU, which | 730 | /* XXX todo: If we can have multiple windows on the same IOMMU, which |
731 | * isn't the case today, we probably want here to check wether the | 731 | * isn't the case today, we probably want here to check whether the |
732 | * iommu for that node is already setup. | 732 | * iommu for that node is already setup. |
733 | * However, there might be issue with getting the size right so let's | 733 | * However, there might be issue with getting the size right so let's |
734 | * ignore that for now. We might want to completely get rid of the | 734 | * ignore that for now. We might want to completely get rid of the |
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index d8b7cc8a66ca..8e299447127e 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c | |||
@@ -148,7 +148,7 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type) | |||
148 | 148 | ||
149 | /* Configure the source. One gross hack that was there before and | 149 | /* Configure the source. One gross hack that was there before and |
150 | * that I've kept around is the priority to the BE which I set to | 150 | * that I've kept around is the priority to the BE which I set to |
151 | * be the same as the interrupt source number. I don't know wether | 151 | * be the same as the interrupt source number. I don't know whether |
152 | * that's supposed to make any kind of sense however, we'll have to | 152 | * that's supposed to make any kind of sense however, we'll have to |
153 | * decide that, but for now, I'm not changing the behaviour. | 153 | * decide that, but for now, I'm not changing the behaviour. |
154 | */ | 154 | */ |
@@ -220,7 +220,7 @@ static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc) | |||
220 | /* For hooking up the cascace we have a problem. Our device-tree is | 220 | /* For hooking up the cascace we have a problem. Our device-tree is |
221 | * crap and we don't know on which BE iic interrupt we are hooked on at | 221 | * crap and we don't know on which BE iic interrupt we are hooked on at |
222 | * least not the "standard" way. We can reconstitute it based on two | 222 | * least not the "standard" way. We can reconstitute it based on two |
223 | * informations though: which BE node we are connected to and wether | 223 | * informations though: which BE node we are connected to and whether |
224 | * we are connected to IOIF0 or IOIF1. Right now, we really only care | 224 | * we are connected to IOIF0 or IOIF1. Right now, we really only care |
225 | * about the IBM cell blade and we know that its firmware gives us an | 225 | * about the IBM cell blade and we know that its firmware gives us an |
226 | * interrupt-map property which is pretty strange. | 226 | * interrupt-map property which is pretty strange. |
@@ -232,7 +232,7 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) | |||
232 | int imaplen, intsize, unit; | 232 | int imaplen, intsize, unit; |
233 | struct device_node *iic; | 233 | struct device_node *iic; |
234 | 234 | ||
235 | /* First, we check wether we have a real "interrupts" in the device | 235 | /* First, we check whether we have a real "interrupts" in the device |
236 | * tree in case the device-tree is ever fixed | 236 | * tree in case the device-tree is ever fixed |
237 | */ | 237 | */ |
238 | struct of_irq oirq; | 238 | struct of_irq oirq; |
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index c4e630576ff2..31036b56670e 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c | |||
@@ -529,7 +529,7 @@ static int __init pmac_pic_probe_mpic(void) | |||
529 | void __init pmac_pic_init(void) | 529 | void __init pmac_pic_init(void) |
530 | { | 530 | { |
531 | /* We configure the OF parsing based on our oldworld vs. newworld | 531 | /* We configure the OF parsing based on our oldworld vs. newworld |
532 | * platform type and wether we were booted by BootX. | 532 | * platform type and whether we were booted by BootX. |
533 | */ | 533 | */ |
534 | #ifdef CONFIG_PPC32 | 534 | #ifdef CONFIG_PPC32 |
535 | if (!pmac_newworld) | 535 | if (!pmac_newworld) |
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c index 6cba0a7068bc..d71a0bcf8145 100644 --- a/arch/sh/boards/board-espt.c +++ b/arch/sh/boards/board-espt.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Data Technology Inc. ESPT-GIGA board suport | 2 | * Data Technology Inc. ESPT-GIGA board support |
3 | * | 3 | * |
4 | * Copyright (C) 2008, 2009 Renesas Solutions Corp. | 4 | * Copyright (C) 2008, 2009 Renesas Solutions Corp. |
5 | * Copyright (C) 2008, 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> | 5 | * Copyright (C) 2008, 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> |
diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index 851fe936d242..e3cf9f682be5 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore | |||
@@ -2,7 +2,6 @@ bootsect | |||
2 | bzImage | 2 | bzImage |
3 | cpustr.h | 3 | cpustr.h |
4 | mkcpustr | 4 | mkcpustr |
5 | offsets.h | ||
6 | voffset.h | 5 | voffset.h |
7 | zoffset.h | 6 | zoffset.h |
8 | setup | 7 | setup |
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index e4c1a4184531..726bf963c227 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c | |||
@@ -606,7 +606,7 @@ void __init mtrr_bp_init(void) | |||
606 | 606 | ||
607 | /* | 607 | /* |
608 | * This is an AMD specific MSR, but we assume(hope?) that | 608 | * This is an AMD specific MSR, but we assume(hope?) that |
609 | * Intel will implement it to when they extend the address | 609 | * Intel will implement it too when they extend the address |
610 | * bus of the Xeon. | 610 | * bus of the Xeon. |
611 | */ | 611 | */ |
612 | if (cpuid_eax(0x80000000) >= 0x80000008) { | 612 | if (cpuid_eax(0x80000000) >= 0x80000008) { |
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 8573b83a63d0..217eb705fac0 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
@@ -137,7 +137,7 @@ static void pgd_dtor(pgd_t *pgd) | |||
137 | * against pageattr.c; it is the unique case in which a valid change | 137 | * against pageattr.c; it is the unique case in which a valid change |
138 | * of kernel pagetables can't be lazily synchronized by vmalloc faults. | 138 | * of kernel pagetables can't be lazily synchronized by vmalloc faults. |
139 | * vmalloc faults work because attached pagetables are never freed. | 139 | * vmalloc faults work because attached pagetables are never freed. |
140 | * -- wli | 140 | * -- nyc |
141 | */ | 141 | */ |
142 | 142 | ||
143 | #ifdef CONFIG_X86_PAE | 143 | #ifdef CONFIG_X86_PAE |
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c index 0df024e5fb63..d09c6b4bab2c 100644 --- a/drivers/acpi/acpica/dsopcode.c +++ b/drivers/acpi/acpica/dsopcode.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /****************************************************************************** | 1 | /****************************************************************************** |
2 | * | 2 | * |
3 | * Module Name: dsopcode - Dispatcher suport for regions and fields | 3 | * Module Name: dsopcode - Dispatcher support for regions and fields |
4 | * | 4 | * |
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index a0c84bb30856..053201b062a4 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
@@ -3789,7 +3789,7 @@ static int handle_one_recv_msg(ipmi_smi_t intf, | |||
3789 | 3789 | ||
3790 | } else if ((msg->rsp[0] == ((IPMI_NETFN_APP_REQUEST|1) << 2)) | 3790 | } else if ((msg->rsp[0] == ((IPMI_NETFN_APP_REQUEST|1) << 2)) |
3791 | && (msg->rsp[1] == IPMI_READ_EVENT_MSG_BUFFER_CMD)) { | 3791 | && (msg->rsp[1] == IPMI_READ_EVENT_MSG_BUFFER_CMD)) { |
3792 | /* It's an asyncronous event. */ | 3792 | /* It's an asynchronous event. */ |
3793 | requeue = handle_read_event_rsp(intf, msg); | 3793 | requeue = handle_read_event_rsp(intf, msg); |
3794 | } else { | 3794 | } else { |
3795 | /* It's a response from the local BMC. */ | 3795 | /* It's a response from the local BMC. */ |
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 20ab5b3a8915..cfdfecd5bc76 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -155,7 +155,7 @@ enum si_stat_indexes { | |||
155 | /* Number of watchdog pretimeouts. */ | 155 | /* Number of watchdog pretimeouts. */ |
156 | SI_STAT_watchdog_pretimeouts, | 156 | SI_STAT_watchdog_pretimeouts, |
157 | 157 | ||
158 | /* Number of asyncronous messages received. */ | 158 | /* Number of asynchronous messages received. */ |
159 | SI_STAT_incoming_messages, | 159 | SI_STAT_incoming_messages, |
160 | 160 | ||
161 | 161 | ||
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index d0d824ebf2c1..1cd49241e60e 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
@@ -251,12 +251,8 @@ static ssize_t pp_write (struct file * file, const char __user * buf, | |||
251 | break; | 251 | break; |
252 | } | 252 | } |
253 | 253 | ||
254 | if (signal_pending (current)) { | 254 | if (signal_pending (current)) |
255 | if (!bytes_written) { | ||
256 | bytes_written = -EINTR; | ||
257 | } | ||
258 | break; | 255 | break; |
259 | } | ||
260 | 256 | ||
261 | cond_resched(); | 257 | cond_resched(); |
262 | } | 258 | } |
diff --git a/drivers/eisa/eisa.ids b/drivers/eisa/eisa.ids index 6cbb7a514436..2d864b48a48f 100644 --- a/drivers/eisa/eisa.ids +++ b/drivers/eisa/eisa.ids | |||
@@ -985,8 +985,8 @@ ISABD00 "Racal-Interlan NP600A Ethernet 16bit" | |||
985 | ISABD02 "Racal-Interlan NI5210/8 Ethernet" | 985 | ISABD02 "Racal-Interlan NI5210/8 Ethernet" |
986 | ISABD03 "Racal-Interlan NI5210/16 Ethernet" | 986 | ISABD03 "Racal-Interlan NI5210/16 Ethernet" |
987 | ISABE00 "Qua Tech PXB-1608 Parallel Expansion Board" | 987 | ISABE00 "Qua Tech PXB-1608 Parallel Expansion Board" |
988 | ISABE01 "Qua Tech ES-100 8 Channel Asyncronous" | 988 | ISABE01 "Qua Tech ES-100 8 Channel Asynchronous" |
989 | ISABE02 "Qua Tech QS-100M 4 Channel Asyncronous" | 989 | ISABE02 "Qua Tech QS-100M 4 Channel Asynchronous" |
990 | ISABE03 "Qua Tech MXI-100 IEEE 488 GPIB" | 990 | ISABE03 "Qua Tech MXI-100 IEEE 488 GPIB" |
991 | ISABE04 "Qua Tech DS-201 Dual Channel RS-422" | 991 | ISABE04 "Qua Tech DS-201 Dual Channel RS-422" |
992 | ISABE05 "Qua Tech PXB-721 Parallel Expansion" | 992 | ISABE05 "Qua Tech PXB-721 Parallel Expansion" |
diff --git a/drivers/firewire/init_ohci1394_dma.c b/drivers/firewire/init_ohci1394_dma.c index a9a347adb353..2cc89ce745c9 100644 --- a/drivers/firewire/init_ohci1394_dma.c +++ b/drivers/firewire/init_ohci1394_dma.c | |||
@@ -149,10 +149,10 @@ static inline void __init init_ohci1394_initialize(struct ohci *ohci) | |||
149 | reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff); | 149 | reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff); |
150 | reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff); | 150 | reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff); |
151 | 151 | ||
152 | /* Accept asyncronous transfer requests from all nodes for now */ | 152 | /* Accept asynchronous transfer requests from all nodes for now */ |
153 | reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); | 153 | reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); |
154 | 154 | ||
155 | /* Specify asyncronous transfer retries */ | 155 | /* Specify asynchronous transfer retries */ |
156 | reg_write(ohci, OHCI1394_ATRetries, | 156 | reg_write(ohci, OHCI1394_ATRetries, |
157 | OHCI1394_MAX_AT_REQ_RETRIES | | 157 | OHCI1394_MAX_AT_REQ_RETRIES | |
158 | (OHCI1394_MAX_AT_RESP_RETRIES<<4) | | 158 | (OHCI1394_MAX_AT_RESP_RETRIES<<4) | |
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index f25610bb3148..6ce6e07c38c1 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -1281,7 +1281,7 @@ static int at_context_queue_packet(struct context *ctx, | |||
1281 | d[0].res_count = cpu_to_le16(packet->timestamp); | 1281 | d[0].res_count = cpu_to_le16(packet->timestamp); |
1282 | 1282 | ||
1283 | /* | 1283 | /* |
1284 | * The DMA format for asyncronous link packets is different | 1284 | * The DMA format for asynchronous link packets is different |
1285 | * from the IEEE1394 layout, so shift the fields around | 1285 | * from the IEEE1394 layout, so shift the fields around |
1286 | * accordingly. | 1286 | * accordingly. |
1287 | */ | 1287 | */ |
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index a5cbeec6f6db..bf892bd68c17 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
@@ -504,7 +504,7 @@ config GPIO_ADNP | |||
504 | help | 504 | help |
505 | This option enables support for N GPIOs found on Avionic Design | 505 | This option enables support for N GPIOs found on Avionic Design |
506 | I2C GPIO expanders. The register space will be extended by powers | 506 | I2C GPIO expanders. The register space will be extended by powers |
507 | of two, so the controller will need to accomodate for that. For | 507 | of two, so the controller will need to accommodate for that. For |
508 | example: if a controller provides 48 pins, 6 registers will be | 508 | example: if a controller provides 48 pins, 6 registers will be |
509 | enough to represent all pins, but the driver will assume a | 509 | enough to represent all pins, but the driver will assume a |
510 | register layout for 64 pins (8 registers). | 510 | register layout for 64 pins (8 registers). |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 219942c660d7..5d1d21a6dcdd 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -1650,7 +1650,7 @@ static int evergreen_cp_resume(struct radeon_device *rdev) | |||
1650 | ring->wptr = 0; | 1650 | ring->wptr = 0; |
1651 | WREG32(CP_RB_WPTR, ring->wptr); | 1651 | WREG32(CP_RB_WPTR, ring->wptr); |
1652 | 1652 | ||
1653 | /* set the wb address wether it's enabled or not */ | 1653 | /* set the wb address whether it's enabled or not */ |
1654 | WREG32(CP_RB_RPTR_ADDR, | 1654 | WREG32(CP_RB_RPTR_ADDR, |
1655 | ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); | 1655 | ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); |
1656 | WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); | 1656 | WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 81e6a568c29d..cda01f808f12 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1059,7 +1059,7 @@ static int cayman_cp_resume(struct radeon_device *rdev) | |||
1059 | 1059 | ||
1060 | WREG32(CP_DEBUG, (1 << 27)); | 1060 | WREG32(CP_DEBUG, (1 << 27)); |
1061 | 1061 | ||
1062 | /* set the wb address wether it's enabled or not */ | 1062 | /* set the wb address whether it's enabled or not */ |
1063 | WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); | 1063 | WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); |
1064 | WREG32(SCRATCH_UMSK, 0xff); | 1064 | WREG32(SCRATCH_UMSK, 0xff); |
1065 | 1065 | ||
@@ -1076,7 +1076,7 @@ static int cayman_cp_resume(struct radeon_device *rdev) | |||
1076 | #endif | 1076 | #endif |
1077 | WREG32(cp_rb_cntl[i], rb_cntl); | 1077 | WREG32(cp_rb_cntl[i], rb_cntl); |
1078 | 1078 | ||
1079 | /* set the wb address wether it's enabled or not */ | 1079 | /* set the wb address whether it's enabled or not */ |
1080 | addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; | 1080 | addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; |
1081 | WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); | 1081 | WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); |
1082 | WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); | 1082 | WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); |
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 47634f27f2e5..ebd69562ef6c 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
@@ -459,7 +459,7 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *r | |||
459 | * | 459 | * |
460 | * @ring: radeon_ring structure holding ring information | 460 | * @ring: radeon_ring structure holding ring information |
461 | * | 461 | * |
462 | * Reset the driver's copy of the wtpr (all asics). | 462 | * Reset the driver's copy of the wptr (all asics). |
463 | */ | 463 | */ |
464 | void radeon_ring_undo(struct radeon_ring *ring) | 464 | void radeon_ring_undo(struct radeon_ring *ring) |
465 | { | 465 | { |
@@ -503,7 +503,7 @@ void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring * | |||
503 | } | 503 | } |
504 | 504 | ||
505 | /** | 505 | /** |
506 | * radeon_ring_force_activity - update lockup variables | 506 | * radeon_ring_lockup_update - update lockup variables |
507 | * | 507 | * |
508 | * @ring: radeon_ring structure holding ring information | 508 | * @ring: radeon_ring structure holding ring information |
509 | * | 509 | * |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 4422d630b33b..010156dd949f 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -2007,7 +2007,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2007 | ring->wptr = 0; | 2007 | ring->wptr = 0; |
2008 | WREG32(CP_RB0_WPTR, ring->wptr); | 2008 | WREG32(CP_RB0_WPTR, ring->wptr); |
2009 | 2009 | ||
2010 | /* set the wb address wether it's enabled or not */ | 2010 | /* set the wb address whether it's enabled or not */ |
2011 | WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); | 2011 | WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); |
2012 | WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); | 2012 | WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); |
2013 | 2013 | ||
@@ -2040,7 +2040,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2040 | ring->wptr = 0; | 2040 | ring->wptr = 0; |
2041 | WREG32(CP_RB1_WPTR, ring->wptr); | 2041 | WREG32(CP_RB1_WPTR, ring->wptr); |
2042 | 2042 | ||
2043 | /* set the wb address wether it's enabled or not */ | 2043 | /* set the wb address whether it's enabled or not */ |
2044 | WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); | 2044 | WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); |
2045 | WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); | 2045 | WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); |
2046 | 2046 | ||
@@ -2066,7 +2066,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2066 | ring->wptr = 0; | 2066 | ring->wptr = 0; |
2067 | WREG32(CP_RB2_WPTR, ring->wptr); | 2067 | WREG32(CP_RB2_WPTR, ring->wptr); |
2068 | 2068 | ||
2069 | /* set the wb address wether it's enabled or not */ | 2069 | /* set the wb address whether it's enabled or not */ |
2070 | WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); | 2070 | WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); |
2071 | WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); | 2071 | WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); |
2072 | 2072 | ||
diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c index f41502ef3f55..a23b91b0b738 100644 --- a/drivers/i2c/busses/i2c-nuc900.c +++ b/drivers/i2c/busses/i2c-nuc900.c | |||
@@ -304,7 +304,7 @@ retry_write: | |||
304 | 304 | ||
305 | case STATE_READ: | 305 | case STATE_READ: |
306 | /* we have a byte of data in the data register, do | 306 | /* we have a byte of data in the data register, do |
307 | * something with it, and then work out wether we are | 307 | * something with it, and then work out whether we are |
308 | * going to do any more read/write | 308 | * going to do any more read/write |
309 | */ | 309 | */ |
310 | 310 | ||
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 9d902725bac9..b33d95ebc890 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -208,7 +208,7 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c, | |||
208 | if (msg->flags & I2C_M_REV_DIR_ADDR) | 208 | if (msg->flags & I2C_M_REV_DIR_ADDR) |
209 | addr ^= 1; | 209 | addr ^= 1; |
210 | 210 | ||
211 | /* todo - check for wether ack wanted or not */ | 211 | /* todo - check for whether ack wanted or not */ |
212 | s3c24xx_i2c_enable_ack(i2c); | 212 | s3c24xx_i2c_enable_ack(i2c); |
213 | 213 | ||
214 | iiccon = readl(i2c->regs + S3C2410_IICCON); | 214 | iiccon = readl(i2c->regs + S3C2410_IICCON); |
@@ -397,7 +397,7 @@ static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
397 | 397 | ||
398 | case STATE_READ: | 398 | case STATE_READ: |
399 | /* we have a byte of data in the data register, do | 399 | /* we have a byte of data in the data register, do |
400 | * something with it, and then work out wether we are | 400 | * something with it, and then work out whether we are |
401 | * going to do any more read/write | 401 | * going to do any more read/write |
402 | */ | 402 | */ |
403 | 403 | ||
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c index 89342f7e0c5b..525471e776a7 100644 --- a/drivers/isdn/hisax/amd7930_fn.c +++ b/drivers/isdn/hisax/amd7930_fn.c | |||
@@ -628,7 +628,7 @@ Amd7930_l1hw(struct PStack *st, int pr, void *arg) | |||
628 | if ((cs->dc.amd7930.ph_state == 8)) { | 628 | if ((cs->dc.amd7930.ph_state == 8)) { |
629 | /* b-channels off, PH-AR cleared | 629 | /* b-channels off, PH-AR cleared |
630 | * change to F3 */ | 630 | * change to F3 */ |
631 | Amd7930_ph_command(cs, 0x20, "HW_RESET REQEST"); //LMR1 bit 5 | 631 | Amd7930_ph_command(cs, 0x20, "HW_RESET REQUEST"); //LMR1 bit 5 |
632 | spin_unlock_irqrestore(&cs->lock, flags); | 632 | spin_unlock_irqrestore(&cs->lock, flags); |
633 | } else { | 633 | } else { |
634 | Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST"); | 634 | Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST"); |
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c index ff5e139f4850..7fdf34704fe5 100644 --- a/drivers/isdn/hisax/isar.c +++ b/drivers/isdn/hisax/isar.c | |||
@@ -1417,7 +1417,7 @@ modeisar(struct BCState *bcs, int mode, int bc) | |||
1417 | &bcs->hw.isar.reg->Flags)) | 1417 | &bcs->hw.isar.reg->Flags)) |
1418 | bcs->hw.isar.dpath = 1; | 1418 | bcs->hw.isar.dpath = 1; |
1419 | else { | 1419 | else { |
1420 | printk(KERN_WARNING"isar modeisar both pathes in use\n"); | 1420 | printk(KERN_WARNING"isar modeisar both paths in use\n"); |
1421 | return (1); | 1421 | return (1); |
1422 | } | 1422 | } |
1423 | break; | 1423 | break; |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 61200717687b..bd8bf0953fe3 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -4124,7 +4124,7 @@ static struct md_sysfs_entry md_size = | |||
4124 | __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store); | 4124 | __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store); |
4125 | 4125 | ||
4126 | 4126 | ||
4127 | /* Metdata version. | 4127 | /* Metadata version. |
4128 | * This is one of | 4128 | * This is one of |
4129 | * 'none' for arrays with no metadata (good luck...) | 4129 | * 'none' for arrays with no metadata (good luck...) |
4130 | * 'external' for arrays with externally managed metadata, | 4130 | * 'external' for arrays with externally managed metadata, |
diff --git a/drivers/md/persistent-data/dm-block-manager.c b/drivers/md/persistent-data/dm-block-manager.c index 5ba277768d99..a3ae09124a67 100644 --- a/drivers/md/persistent-data/dm-block-manager.c +++ b/drivers/md/persistent-data/dm-block-manager.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * may be held at once. This is just an implementation detail. | 25 | * may be held at once. This is just an implementation detail. |
26 | * | 26 | * |
27 | * ii) Recursive locking attempts are detected and return EINVAL. A stack | 27 | * ii) Recursive locking attempts are detected and return EINVAL. A stack |
28 | * trace is also emitted for the previous lock aquisition. | 28 | * trace is also emitted for the previous lock acquisition. |
29 | * | 29 | * |
30 | * iii) Priority is given to write locks. | 30 | * iii) Priority is given to write locks. |
31 | */ | 31 | */ |
@@ -109,7 +109,7 @@ static int __check_holder(struct block_lock *lock) | |||
109 | DMERR("previously held here:"); | 109 | DMERR("previously held here:"); |
110 | print_stack_trace(lock->traces + i, 4); | 110 | print_stack_trace(lock->traces + i, 4); |
111 | 111 | ||
112 | DMERR("subsequent aquisition attempted here:"); | 112 | DMERR("subsequent acquisition attempted here:"); |
113 | t.nr_entries = 0; | 113 | t.nr_entries = 0; |
114 | t.max_entries = MAX_STACK; | 114 | t.max_entries = MAX_STACK; |
115 | t.entries = entries; | 115 | t.entries = entries; |
diff --git a/drivers/md/persistent-data/dm-btree.h b/drivers/md/persistent-data/dm-btree.h index ae02c84410ff..a2cd50441ca1 100644 --- a/drivers/md/persistent-data/dm-btree.h +++ b/drivers/md/persistent-data/dm-btree.h | |||
@@ -35,7 +35,7 @@ struct dm_transaction_manager; | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Infomation about the values stored within the btree. | 38 | * Information about the values stored within the btree. |
39 | */ | 39 | */ |
40 | struct dm_btree_value_type { | 40 | struct dm_btree_value_type { |
41 | void *context; | 41 | void *context; |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index a4502686e7a8..3380372c0393 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -1576,7 +1576,7 @@ static int resize_stripes(struct r5conf *conf, int newsize) | |||
1576 | * This happens in stages: | 1576 | * This happens in stages: |
1577 | * 1/ create a new kmem_cache and allocate the required number of | 1577 | * 1/ create a new kmem_cache and allocate the required number of |
1578 | * stripe_heads. | 1578 | * stripe_heads. |
1579 | * 2/ gather all the old stripe_heads and tranfer the pages across | 1579 | * 2/ gather all the old stripe_heads and transfer the pages across |
1580 | * to the new stripe_heads. This will have the side effect of | 1580 | * to the new stripe_heads. This will have the side effect of |
1581 | * freezing the array as once all stripe_heads have been collected, | 1581 | * freezing the array as once all stripe_heads have been collected, |
1582 | * no IO will be possible. Old stripe heads are freed once their | 1582 | * no IO will be possible. Old stripe heads are freed once their |
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 8b4c6d5f8f36..df9abe83f877 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c | |||
@@ -948,7 +948,7 @@ static int GetDeviceCapabilities(struct drxk_state *state) | |||
948 | state->m_oscClockFreq = 20250; | 948 | state->m_oscClockFreq = 20250; |
949 | break; | 949 | break; |
950 | default: | 950 | default: |
951 | printk(KERN_ERR "drxk: Clock Frequency is unkonwn\n"); | 951 | printk(KERN_ERR "drxk: Clock Frequency is unknown\n"); |
952 | return -EINVAL; | 952 | return -EINVAL; |
953 | } | 953 | } |
954 | /* | 954 | /* |
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c index 8f22ce543cf7..bfa65079fc38 100644 --- a/drivers/media/platform/mx2_emmaprp.c +++ b/drivers/media/platform/mx2_emmaprp.c | |||
@@ -371,7 +371,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data) | |||
371 | if (!curr_ctx->aborting) { | 371 | if (!curr_ctx->aborting) { |
372 | if ((irqst & PRP_INTR_ST_RDERR) || | 372 | if ((irqst & PRP_INTR_ST_RDERR) || |
373 | (irqst & PRP_INTR_ST_CH2WERR)) { | 373 | (irqst & PRP_INTR_ST_CH2WERR)) { |
374 | pr_err("PrP bus error ocurred, this transfer is probably corrupted\n"); | 374 | pr_err("PrP bus error occurred, this transfer is probably corrupted\n"); |
375 | writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); | 375 | writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); |
376 | } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ | 376 | } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ |
377 | src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); | 377 | src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); |
diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl index 5fb195af43e2..4a7d2ebdfc97 100644 --- a/drivers/message/i2o/README.ioctl +++ b/drivers/message/i2o/README.ioctl | |||
@@ -138,7 +138,7 @@ VI. Setting Parameters | |||
138 | 138 | ||
139 | The return value is the size in bytes of the data written into | 139 | The return value is the size in bytes of the data written into |
140 | ops->resbuf if no errors occur. If an error occurs, -1 is returned | 140 | ops->resbuf if no errors occur. If an error occurs, -1 is returned |
141 | and errno is set appropriatly: | 141 | and errno is set appropriately: |
142 | 142 | ||
143 | EFAULT Invalid user space pointer was passed | 143 | EFAULT Invalid user space pointer was passed |
144 | ENXIO Invalid IOP number | 144 | ENXIO Invalid IOP number |
@@ -222,7 +222,7 @@ VIII. Downloading Software | |||
222 | RETURNS | 222 | RETURNS |
223 | 223 | ||
224 | This function returns 0 no errors occur. If an error occurs, -1 | 224 | This function returns 0 no errors occur. If an error occurs, -1 |
225 | is returned and errno is set appropriatly: | 225 | is returned and errno is set appropriately: |
226 | 226 | ||
227 | EFAULT Invalid user space pointer was passed | 227 | EFAULT Invalid user space pointer was passed |
228 | ENXIO Invalid IOP number | 228 | ENXIO Invalid IOP number |
@@ -264,7 +264,7 @@ IX. Uploading Software | |||
264 | RETURNS | 264 | RETURNS |
265 | 265 | ||
266 | This function returns 0 if no errors occur. If an error occurs, -1 | 266 | This function returns 0 if no errors occur. If an error occurs, -1 |
267 | is returned and errno is set appropriatly: | 267 | is returned and errno is set appropriately: |
268 | 268 | ||
269 | EFAULT Invalid user space pointer was passed | 269 | EFAULT Invalid user space pointer was passed |
270 | ENXIO Invalid IOP number | 270 | ENXIO Invalid IOP number |
@@ -301,7 +301,7 @@ X. Removing Software | |||
301 | RETURNS | 301 | RETURNS |
302 | 302 | ||
303 | This function returns 0 if no errors occur. If an error occurs, -1 | 303 | This function returns 0 if no errors occur. If an error occurs, -1 |
304 | is returned and errno is set appropriatly: | 304 | is returned and errno is set appropriately: |
305 | 305 | ||
306 | EFAULT Invalid user space pointer was passed | 306 | EFAULT Invalid user space pointer was passed |
307 | ENXIO Invalid IOP number | 307 | ENXIO Invalid IOP number |
@@ -325,7 +325,7 @@ X. Validating Configuration | |||
325 | RETURNS | 325 | RETURNS |
326 | 326 | ||
327 | This function returns 0 if no erro occur. If an error occurs, -1 is | 327 | This function returns 0 if no erro occur. If an error occurs, -1 is |
328 | returned and errno is set appropriatly: | 328 | returned and errno is set appropriately: |
329 | 329 | ||
330 | ETIMEDOUT Timeout waiting for reply message | 330 | ETIMEDOUT Timeout waiting for reply message |
331 | ENXIO Invalid IOP number | 331 | ENXIO Invalid IOP number |
@@ -360,7 +360,7 @@ XI. Configuration Dialog | |||
360 | RETURNS | 360 | RETURNS |
361 | 361 | ||
362 | This function returns 0 if no error occur. If an error occurs, -1 | 362 | This function returns 0 if no error occur. If an error occurs, -1 |
363 | is returned and errno is set appropriatly: | 363 | is returned and errno is set appropriately: |
364 | 364 | ||
365 | EFAULT Invalid user space pointer was passed | 365 | EFAULT Invalid user space pointer was passed |
366 | ENXIO Invalid IOP number | 366 | ENXIO Invalid IOP number |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 4796bbf0ae4e..49e86aed2bc4 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
@@ -609,7 +609,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode) | |||
609 | u8 operation; | 609 | u8 operation; |
610 | 610 | ||
611 | /* | 611 | /* |
612 | * This is to deail with the case of an application | 612 | * This is to deal with the case of an application |
613 | * opening a device and then the device disappears while | 613 | * opening a device and then the device disappears while |
614 | * it's in use, and then the application tries to release | 614 | * it's in use, and then the application tries to release |
615 | * it. ex: Unmounting a deleted RAID volume at reboot. | 615 | * it. ex: Unmounting a deleted RAID volume at reboot. |
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 9a49c243a6ac..5451beff183f 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
@@ -189,7 +189,7 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type) | |||
189 | return -ENXIO; | 189 | return -ENXIO; |
190 | 190 | ||
191 | /* | 191 | /* |
192 | * Stop users being able to try and allocate arbitary amounts | 192 | * Stop users being able to try and allocate arbitrary amounts |
193 | * of DMA space. 64K is way more than sufficient for this. | 193 | * of DMA space. 64K is way more than sufficient for this. |
194 | */ | 194 | */ |
195 | if (kcmd.oplen > 65536) | 195 | if (kcmd.oplen > 65536) |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 737e4edc241b..8d13c6594520 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -533,7 +533,7 @@ config MMC_DW_PLTFM | |||
533 | If unsure, say Y. | 533 | If unsure, say Y. |
534 | 534 | ||
535 | config MMC_DW_EXYNOS | 535 | config MMC_DW_EXYNOS |
536 | tristate "Exynos specific extentions for Synopsys DW Memory Card Interface" | 536 | tristate "Exynos specific extensions for Synopsys DW Memory Card Interface" |
537 | depends on MMC_DW | 537 | depends on MMC_DW |
538 | select MMC_DW_PLTFM | 538 | select MMC_DW_PLTFM |
539 | help | 539 | help |
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c index 891558de3ec1..2de66b062f0d 100644 --- a/drivers/mtd/maps/plat-ram.c +++ b/drivers/mtd/maps/plat-ram.c | |||
@@ -219,7 +219,7 @@ static int platram_probe(struct platform_device *pdev) | |||
219 | 219 | ||
220 | platram_setrw(info, PLATRAM_RW); | 220 | platram_setrw(info, PLATRAM_RW); |
221 | 221 | ||
222 | /* check to see if there are any available partitions, or wether | 222 | /* check to see if there are any available partitions, or whether |
223 | * to add this device whole */ | 223 | * to add this device whole */ |
224 | 224 | ||
225 | err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, | 225 | err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, |
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 295e4bedad96..79ded48e7427 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -879,7 +879,7 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info, | |||
879 | if (chip->ecc.mode != NAND_ECC_HW) | 879 | if (chip->ecc.mode != NAND_ECC_HW) |
880 | return; | 880 | return; |
881 | 881 | ||
882 | /* change the behaviour depending on wether we are using | 882 | /* change the behaviour depending on whether we are using |
883 | * the large or small page nand device */ | 883 | * the large or small page nand device */ |
884 | 884 | ||
885 | if (chip->page_shift > 10) { | 885 | if (chip->page_shift > 10) { |
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 6dded569b111..21b68e5c14fd 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -245,7 +245,7 @@ struct bonding { | |||
245 | struct delayed_work ad_work; | 245 | struct delayed_work ad_work; |
246 | struct delayed_work mcast_work; | 246 | struct delayed_work mcast_work; |
247 | #ifdef CONFIG_DEBUG_FS | 247 | #ifdef CONFIG_DEBUG_FS |
248 | /* debugging suport via debugfs */ | 248 | /* debugging support via debugfs */ |
249 | struct dentry *debug_dir; | 249 | struct dentry *debug_dir; |
250 | #endif /* CONFIG_DEBUG_FS */ | 250 | #endif /* CONFIG_DEBUG_FS */ |
251 | }; | 251 | }; |
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 0338352bc036..70dba5d01ad3 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c | |||
@@ -109,7 +109,7 @@ static inline struct ax_device *to_ax_dev(struct net_device *dev) | |||
109 | /* | 109 | /* |
110 | * ax_initial_check | 110 | * ax_initial_check |
111 | * | 111 | * |
112 | * do an initial probe for the card to check wether it exists | 112 | * do an initial probe for the card to check whether it exists |
113 | * and is functional | 113 | * and is functional |
114 | */ | 114 | */ |
115 | static int ax_initial_check(struct net_device *dev) | 115 | static int ax_initial_check(struct net_device *dev) |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c index b8b4b749daab..09b625e0fdaa 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | |||
@@ -4318,7 +4318,7 @@ static int bnx2x_queue_comp_cmd(struct bnx2x *bp, | |||
4318 | 4318 | ||
4319 | if (o->next_tx_only >= o->max_cos) | 4319 | if (o->next_tx_only >= o->max_cos) |
4320 | /* >= becuase tx only must always be smaller than cos since the | 4320 | /* >= becuase tx only must always be smaller than cos since the |
4321 | * primary connection suports COS 0 | 4321 | * primary connection supports COS 0 |
4322 | */ | 4322 | */ |
4323 | BNX2X_ERR("illegal value for next tx_only: %d. max cos was %d", | 4323 | BNX2X_ERR("illegal value for next tx_only: %d. max cos was %d", |
4324 | o->next_tx_only, o->max_cos); | 4324 | o->next_tx_only, o->max_cos); |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 9089d00f1421..14e30515f6aa 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c | |||
@@ -1671,7 +1671,7 @@ static void e1000_get_wol(struct net_device *netdev, | |||
1671 | /* apply any specific unsupported masks here */ | 1671 | /* apply any specific unsupported masks here */ |
1672 | switch (hw->device_id) { | 1672 | switch (hw->device_id) { |
1673 | case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: | 1673 | case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: |
1674 | /* KSP3 does not suppport UCAST wake-ups */ | 1674 | /* KSP3 does not support UCAST wake-ups */ |
1675 | wol->supported &= ~WAKE_UCAST; | 1675 | wol->supported &= ~WAKE_UCAST; |
1676 | 1676 | ||
1677 | if (adapter->wol & E1000_WUFC_EX) | 1677 | if (adapter->wol & E1000_WUFC_EX) |
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index b84a88bc44dc..c48cf6f6529c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c | |||
@@ -1267,7 +1267,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev) | |||
1267 | /* Temporary use polling for command completions */ | 1267 | /* Temporary use polling for command completions */ |
1268 | mlx4_cmd_use_polling(dev); | 1268 | mlx4_cmd_use_polling(dev); |
1269 | 1269 | ||
1270 | /* Map the new eq to handle all asyncronous events */ | 1270 | /* Map the new eq to handle all asynchronous events */ |
1271 | err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0, | 1271 | err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0, |
1272 | priv->eq_table.eq[i].eqn); | 1272 | priv->eq_table.eq[i].eqn); |
1273 | if (err) { | 1273 | if (err) { |
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index 093d594435e1..83f0ea929d3d 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c | |||
@@ -6769,7 +6769,7 @@ static int stp; | |||
6769 | /* | 6769 | /* |
6770 | * This enables fast aging in the KSZ8842 switch. Not sure what situation | 6770 | * This enables fast aging in the KSZ8842 switch. Not sure what situation |
6771 | * needs that. However, fast aging is used to flush the dynamic MAC table when | 6771 | * needs that. However, fast aging is used to flush the dynamic MAC table when |
6772 | * STP suport is enabled. | 6772 | * STP support is enabled. |
6773 | */ | 6773 | */ |
6774 | static int fast_aging; | 6774 | static int fast_aging; |
6775 | 6775 | ||
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h index 7ec4b864a550..75ec5e7cf50d 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h | |||
@@ -27,7 +27,7 @@ struct mcp_gen_header { | |||
27 | * | 27 | * |
28 | * Fields below this comment are extensions added in later versions | 28 | * Fields below this comment are extensions added in later versions |
29 | * of this struct, drivers should compare the header_length against | 29 | * of this struct, drivers should compare the header_length against |
30 | * offsetof(field) to check wether a given MCP implements them. | 30 | * offsetof(field) to check whether a given MCP implements them. |
31 | * | 31 | * |
32 | * Never remove any field. Keep everything naturally align. | 32 | * Never remove any field. Keep everything naturally align. |
33 | */ | 33 | */ |
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 58f13adaa549..ae7cd7f3656d 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
@@ -608,7 +608,7 @@ static int bcm5421_poll_link(struct mii_phy* phy) | |||
608 | if ( mode == BCM54XX_COPPER) | 608 | if ( mode == BCM54XX_COPPER) |
609 | return genmii_poll_link(phy); | 609 | return genmii_poll_link(phy); |
610 | 610 | ||
611 | /* try to find out wether we have a link */ | 611 | /* try to find out whether we have a link */ |
612 | phy_write(phy, MII_NCONFIG, 0x2000); | 612 | phy_write(phy, MII_NCONFIG, 0x2000); |
613 | phy_reg = phy_read(phy, MII_NCONFIG); | 613 | phy_reg = phy_read(phy, MII_NCONFIG); |
614 | 614 | ||
@@ -634,7 +634,7 @@ static int bcm5421_read_link(struct mii_phy* phy) | |||
634 | 634 | ||
635 | phy->speed = SPEED_1000; | 635 | phy->speed = SPEED_1000; |
636 | 636 | ||
637 | /* find out wether we are running half- or full duplex */ | 637 | /* find out whether we are running half- or full duplex */ |
638 | phy_write(phy, MII_NCONFIG, 0x2000); | 638 | phy_write(phy, MII_NCONFIG, 0x2000); |
639 | phy_reg = phy_read(phy, MII_NCONFIG); | 639 | phy_reg = phy_read(phy, MII_NCONFIG); |
640 | 640 | ||
@@ -681,7 +681,7 @@ static int bcm5461_poll_link(struct mii_phy* phy) | |||
681 | if ( mode == BCM54XX_COPPER) | 681 | if ( mode == BCM54XX_COPPER) |
682 | return genmii_poll_link(phy); | 682 | return genmii_poll_link(phy); |
683 | 683 | ||
684 | /* find out wether we have a link */ | 684 | /* find out whether we have a link */ |
685 | phy_write(phy, MII_NCONFIG, 0x7000); | 685 | phy_write(phy, MII_NCONFIG, 0x7000); |
686 | phy_reg = phy_read(phy, MII_NCONFIG); | 686 | phy_reg = phy_read(phy, MII_NCONFIG); |
687 | 687 | ||
@@ -710,7 +710,7 @@ static int bcm5461_read_link(struct mii_phy* phy) | |||
710 | 710 | ||
711 | phy->speed = SPEED_1000; | 711 | phy->speed = SPEED_1000; |
712 | 712 | ||
713 | /* find out wether we are running half- or full duplex */ | 713 | /* find out whether we are running half- or full duplex */ |
714 | phy_write(phy, MII_NCONFIG, 0x7000); | 714 | phy_write(phy, MII_NCONFIG, 0x7000); |
715 | phy_reg = phy_read(phy, MII_NCONFIG); | 715 | phy_reg = phy_read(phy, MII_NCONFIG); |
716 | 716 | ||
diff --git a/drivers/net/wimax/i2400m/debugfs.c b/drivers/net/wimax/i2400m/debugfs.c index 4b66ab1d0e5c..6702da838b0e 100644 --- a/drivers/net/wimax/i2400m/debugfs.c +++ b/drivers/net/wimax/i2400m/debugfs.c | |||
@@ -209,6 +209,7 @@ int debugfs_i2400m_reset_set(void *data, u64 val) | |||
209 | result = i2400m_reset(i2400m, rt); | 209 | result = i2400m_reset(i2400m, rt); |
210 | if (result >= 0) | 210 | if (result >= 0) |
211 | result = 0; | 211 | result = 0; |
212 | break; | ||
212 | default: | 213 | default: |
213 | result = -EINVAL; | 214 | result = -EINVAL; |
214 | } | 215 | } |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 4a4e98f71807..4374079dfc2a 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -2963,7 +2963,7 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc) | |||
2963 | ssid_el_p[1] = priv->SSID_size; | 2963 | ssid_el_p[1] = priv->SSID_size; |
2964 | memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size); | 2964 | memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size); |
2965 | ssid_el_p[2 + priv->SSID_size] = WLAN_EID_SUPP_RATES; | 2965 | ssid_el_p[2 + priv->SSID_size] = WLAN_EID_SUPP_RATES; |
2966 | ssid_el_p[3 + priv->SSID_size] = 4; /* len of suported rates */ | 2966 | ssid_el_p[3 + priv->SSID_size] = 4; /* len of supported rates */ |
2967 | memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4); | 2967 | memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4); |
2968 | 2968 | ||
2969 | atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize); | 2969 | atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize); |
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h index 973125242490..5fe17cbab1f3 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.h +++ b/drivers/net/wireless/ipw2x00/ipw2100.h | |||
@@ -1045,7 +1045,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW | |||
1045 | IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP | 1045 | IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP |
1046 | IPW_ORD_POWER_MGMT_INDEX, //NS // | 1046 | IPW_ORD_POWER_MGMT_INDEX, //NS // |
1047 | IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon | 1047 | IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon |
1048 | IPW_ORD_COUNTRY_CHANNELS, // channels suported by country | 1048 | IPW_ORD_COUNTRY_CHANNELS, // channels supported by country |
1049 | // IPW_ORD_COUNTRY_CHANNELS: | 1049 | // IPW_ORD_COUNTRY_CHANNELS: |
1050 | // For 11b the lower 2-byte are used for channels from 1-14 | 1050 | // For 11b the lower 2-byte are used for channels from 1-14 |
1051 | // and the higher 2-byte are not used. | 1051 | // and the higher 2-byte are not used. |
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index ff306d763e37..71ab320fae82 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -1155,7 +1155,7 @@ int zd_chip_init_hw(struct zd_chip *chip) | |||
1155 | if (r) | 1155 | if (r) |
1156 | goto out; | 1156 | goto out; |
1157 | /* Currently we support IEEE 802.11g for full and high speed USB. | 1157 | /* Currently we support IEEE 802.11g for full and high speed USB. |
1158 | * It might be discussed, whether we should suppport pure b mode for | 1158 | * It might be discussed, whether we should support pure b mode for |
1159 | * full speed USB. | 1159 | * full speed USB. |
1160 | */ | 1160 | */ |
1161 | r = set_mandatory_rates(chip, 1); | 1161 | r = set_mandatory_rates(chip, 1); |
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 07aee694ba92..08fec06dba50 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
@@ -773,7 +773,7 @@ static __devinit int palmas_probe(struct platform_device *pdev) | |||
773 | /* | 773 | /* |
774 | * read and store the RANGE bit for later use | 774 | * read and store the RANGE bit for later use |
775 | * This must be done before regulator is probed otherwise | 775 | * This must be done before regulator is probed otherwise |
776 | * we error in probe with unsuportable ranges. | 776 | * we error in probe with unsupportable ranges. |
777 | */ | 777 | */ |
778 | if (id != PALMAS_REG_SMPS10) { | 778 | if (id != PALMAS_REG_SMPS10) { |
779 | addr = palmas_regs_info[id].vsel_addr; | 779 | addr = palmas_regs_info[id].vsel_addr; |
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c index e1f89d649733..0d36f94ab51d 100644 --- a/drivers/remoteproc/remoteproc_elf_loader.c +++ b/drivers/remoteproc/remoteproc_elf_loader.c | |||
@@ -66,13 +66,13 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw) | |||
66 | return -EINVAL; | 66 | return -EINVAL; |
67 | } | 67 | } |
68 | 68 | ||
69 | /* We assume the firmware has the same endianess as the host */ | 69 | /* We assume the firmware has the same endianness as the host */ |
70 | # ifdef __LITTLE_ENDIAN | 70 | # ifdef __LITTLE_ENDIAN |
71 | if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { | 71 | if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { |
72 | # else /* BIG ENDIAN */ | 72 | # else /* BIG ENDIAN */ |
73 | if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) { | 73 | if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) { |
74 | # endif | 74 | # endif |
75 | dev_err(dev, "Unsupported firmware endianess\n"); | 75 | dev_err(dev, "Unsupported firmware endianness\n"); |
76 | return -EINVAL; | 76 | return -EINVAL; |
77 | } | 77 | } |
78 | 78 | ||
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index 26c81f233606..afb7cfa85ccc 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c | |||
@@ -118,7 +118,7 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], | |||
118 | return ret; | 118 | return ret; |
119 | } | 119 | } |
120 | 120 | ||
121 | /* simple check to see wether we have a isl1208 */ | 121 | /* simple check to see whether we have a isl1208 */ |
122 | static int | 122 | static int |
123 | isl1208_i2c_validate_client(struct i2c_client *client) | 123 | isl1208_i2c_validate_client(struct i2c_client *client) |
124 | { | 124 | { |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 77823d21d314..a7a2a998fa91 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -186,7 +186,7 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) | |||
186 | rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); | 186 | rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); |
187 | rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); | 187 | rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); |
188 | 188 | ||
189 | /* the only way to work out wether the system was mid-update | 189 | /* the only way to work out whether the system was mid-update |
190 | * when we read it is to check the second counter, and if it | 190 | * when we read it is to check the second counter, and if it |
191 | * is zero, then we re-try the entire read | 191 | * is zero, then we re-try the entire read |
192 | */ | 192 | */ |
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index b2b8c18eeced..20cfd028edcf 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
@@ -1344,7 +1344,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature) | |||
1344 | 1344 | ||
1345 | /* | 1345 | /* |
1346 | * Set / reset given feature. | 1346 | * Set / reset given feature. |
1347 | * Flag indicates wether to set (!=0) or the reset (=0) the feature. | 1347 | * Flag indicates whether to set (!=0) or the reset (=0) the feature. |
1348 | */ | 1348 | */ |
1349 | int | 1349 | int |
1350 | dasd_set_feature(struct ccw_device *cdev, int feature, int flag) | 1350 | dasd_set_feature(struct ccw_device *cdev, int feature, int flag) |
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c index 6d6eee42ac7d..ef60afa94d0e 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c | |||
@@ -296,7 +296,7 @@ int bnx2fc_send_session_ofld_req(struct fcoe_port *port, | |||
296 | ofld_req3.flags |= (interface->vlan_enabled << | 296 | ofld_req3.flags |= (interface->vlan_enabled << |
297 | FCOE_KWQE_CONN_OFFLOAD3_B_VLAN_FLAG_SHIFT); | 297 | FCOE_KWQE_CONN_OFFLOAD3_B_VLAN_FLAG_SHIFT); |
298 | 298 | ||
299 | /* C2_VALID and ACK flags are not set as they are not suppported */ | 299 | /* C2_VALID and ACK flags are not set as they are not supported */ |
300 | 300 | ||
301 | 301 | ||
302 | /* Initialize offload request 4 structure */ | 302 | /* Initialize offload request 4 structure */ |
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index efc6e72f09f3..aec2e0da5016 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c | |||
@@ -1800,7 +1800,7 @@ out: | |||
1800 | * @dev:domain device to be detect. | 1800 | * @dev:domain device to be detect. |
1801 | * @src_dev: the device which originated BROADCAST(CHANGE). | 1801 | * @src_dev: the device which originated BROADCAST(CHANGE). |
1802 | * | 1802 | * |
1803 | * Add self-configuration expander suport. Suppose two expander cascading, | 1803 | * Add self-configuration expander support. Suppose two expander cascading, |
1804 | * when the first level expander is self-configuring, hotplug the disks in | 1804 | * when the first level expander is self-configuring, hotplug the disks in |
1805 | * second level expander, BROADCAST(CHANGE) will not only be originated | 1805 | * second level expander, BROADCAST(CHANGE) will not only be originated |
1806 | * in the second level expander, but also be originated in the first level | 1806 | * in the second level expander, but also be originated in the first level |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 5733811ce8e7..9d1c7b56090a 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -251,7 +251,7 @@ qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) | |||
251 | /* Read all mbox registers? */ | 251 | /* Read all mbox registers? */ |
252 | mboxes = (1 << ha->mbx_count) - 1; | 252 | mboxes = (1 << ha->mbx_count) - 1; |
253 | if (!ha->mcp) | 253 | if (!ha->mcp) |
254 | ql_dbg(ql_dbg_async, vha, 0x5001, "MBX pointer ERRROR.\n"); | 254 | ql_dbg(ql_dbg_async, vha, 0x5001, "MBX pointer ERROR.\n"); |
255 | else | 255 | else |
256 | mboxes = ha->mcp->in_mb; | 256 | mboxes = ha->mcp->in_mb; |
257 | 257 | ||
@@ -2318,7 +2318,7 @@ qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) | |||
2318 | /* Read all mbox registers? */ | 2318 | /* Read all mbox registers? */ |
2319 | mboxes = (1 << ha->mbx_count) - 1; | 2319 | mboxes = (1 << ha->mbx_count) - 1; |
2320 | if (!ha->mcp) | 2320 | if (!ha->mcp) |
2321 | ql_dbg(ql_dbg_async, vha, 0x504e, "MBX pointer ERRROR.\n"); | 2321 | ql_dbg(ql_dbg_async, vha, 0x504e, "MBX pointer ERROR.\n"); |
2322 | else | 2322 | else |
2323 | mboxes = ha->mcp->in_mb; | 2323 | mboxes = ha->mcp->in_mb; |
2324 | 2324 | ||
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 14cd361742fa..f5e297c6b684 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
@@ -955,7 +955,7 @@ qla82xx_rom_fast_read(struct qla_hw_data *ha, int addr, int *valp) | |||
955 | } | 955 | } |
956 | if (loops >= 50000) { | 956 | if (loops >= 50000) { |
957 | ql_log(ql_log_fatal, vha, 0x00b9, | 957 | ql_log(ql_log_fatal, vha, 0x00b9, |
958 | "Failed to aquire SEM2 lock.\n"); | 958 | "Failed to acquire SEM2 lock.\n"); |
959 | return -1; | 959 | return -1; |
960 | } | 960 | } |
961 | ret = qla82xx_do_rom_fast_read(ha, addr, valp); | 961 | ret = qla82xx_do_rom_fast_read(ha, addr, valp); |
@@ -1122,7 +1122,7 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha) | |||
1122 | long data; | 1122 | long data; |
1123 | }; | 1123 | }; |
1124 | 1124 | ||
1125 | /* Halt all the indiviual PEGs and other blocks of the ISP */ | 1125 | /* Halt all the individual PEGs and other blocks of the ISP */ |
1126 | qla82xx_rom_lock(ha); | 1126 | qla82xx_rom_lock(ha); |
1127 | 1127 | ||
1128 | /* disable all I2Q */ | 1128 | /* disable all I2Q */ |
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 62aa5584f644..b49d21779a24 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c | |||
@@ -73,7 +73,7 @@ enum fcp_resp_rsp_codes { | |||
73 | #define FCP_PTA_SIMPLE 0 /* simple task attribute */ | 73 | #define FCP_PTA_SIMPLE 0 /* simple task attribute */ |
74 | #define FCP_PTA_HEADQ 1 /* head of queue task attribute */ | 74 | #define FCP_PTA_HEADQ 1 /* head of queue task attribute */ |
75 | #define FCP_PTA_ORDERED 2 /* ordered task attribute */ | 75 | #define FCP_PTA_ORDERED 2 /* ordered task attribute */ |
76 | #define FCP_PTA_ACA 4 /* auto. contigent allegiance */ | 76 | #define FCP_PTA_ACA 4 /* auto. contingent allegiance */ |
77 | #define FCP_PTA_MASK 7 /* mask for task attribute field */ | 77 | #define FCP_PTA_MASK 7 /* mask for task attribute field */ |
78 | #define FCP_PRI_SHIFT 3 /* priority field starts in bit 3 */ | 78 | #define FCP_PRI_SHIFT 3 /* priority field starts in bit 3 */ |
79 | #define FCP_PRI_RESVD_MASK 0x80 /* reserved bits in priority field */ | 79 | #define FCP_PRI_RESVD_MASK 0x80 /* reserved bits in priority field */ |
@@ -3980,7 +3980,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
3980 | case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */ | 3980 | case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */ |
3981 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a, | 3981 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a, |
3982 | "qla_target(%d): System error async event %#x " | 3982 | "qla_target(%d): System error async event %#x " |
3983 | "occured", vha->vp_idx, code); | 3983 | "occurred", vha->vp_idx, code); |
3984 | break; | 3984 | break; |
3985 | case MBA_WAKEUP_THRES: /* Request Queue Wake-up. */ | 3985 | case MBA_WAKEUP_THRES: /* Request Queue Wake-up. */ |
3986 | set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); | 3986 | set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); |
@@ -3989,7 +3989,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
3989 | case MBA_LOOP_UP: | 3989 | case MBA_LOOP_UP: |
3990 | { | 3990 | { |
3991 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b, | 3991 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b, |
3992 | "qla_target(%d): Async LOOP_UP occured " | 3992 | "qla_target(%d): Async LOOP_UP occurred " |
3993 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, | 3993 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, |
3994 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 3994 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
3995 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 3995 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
@@ -4006,7 +4006,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
4006 | case MBA_LIP_RESET: | 4006 | case MBA_LIP_RESET: |
4007 | case MBA_RSCN_UPDATE: | 4007 | case MBA_RSCN_UPDATE: |
4008 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c, | 4008 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c, |
4009 | "qla_target(%d): Async event %#x occured " | 4009 | "qla_target(%d): Async event %#x occurred " |
4010 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, code, | 4010 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, code, |
4011 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 4011 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
4012 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 4012 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
@@ -4015,7 +4015,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
4015 | case MBA_PORT_UPDATE: | 4015 | case MBA_PORT_UPDATE: |
4016 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d, | 4016 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d, |
4017 | "qla_target(%d): Port update async event %#x " | 4017 | "qla_target(%d): Port update async event %#x " |
4018 | "occured: updating the ports database (m[0]=%x, m[1]=%x, " | 4018 | "occurred: updating the ports database (m[0]=%x, m[1]=%x, " |
4019 | "m[2]=%x, m[3]=%x)", vha->vp_idx, code, | 4019 | "m[2]=%x, m[3]=%x)", vha->vp_idx, code, |
4020 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 4020 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
4021 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 4021 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
@@ -4031,7 +4031,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
4031 | 4031 | ||
4032 | default: | 4032 | default: |
4033 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040, | 4033 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040, |
4034 | "qla_target(%d): Async event %#x occured: " | 4034 | "qla_target(%d): Async event %#x occurred: " |
4035 | "ignore (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, | 4035 | "ignore (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, |
4036 | code, le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 4036 | code, le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
4037 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 4037 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 3d74f2f39ae1..4372e32bc95f 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c | |||
@@ -367,7 +367,7 @@ static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl( | |||
367 | 367 | ||
368 | nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL); | 368 | nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL); |
369 | if (!nacl) { | 369 | if (!nacl) { |
370 | pr_err("Unable to alocate struct tcm_qla2xxx_nacl\n"); | 370 | pr_err("Unable to allocate struct tcm_qla2xxx_nacl\n"); |
371 | return NULL; | 371 | return NULL; |
372 | } | 372 | } |
373 | 373 | ||
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 78f3a2e013c4..17b45ebb0553 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c | |||
@@ -73,7 +73,7 @@ sampling rate. If you sample two channels you get 4kHz and so on. | |||
73 | * And loads of cleaning up, in particular streamlining the | 73 | * And loads of cleaning up, in particular streamlining the |
74 | * bulk transfers. | 74 | * bulk transfers. |
75 | * 1.1: moved EP4 transfers to EP1 to make space for a PWM output on EP4 | 75 | * 1.1: moved EP4 transfers to EP1 to make space for a PWM output on EP4 |
76 | * 1.2: added PWM suport via EP4 | 76 | * 1.2: added PWM support via EP4 |
77 | * 2.0: PWM seems to be stable and is not interfering with the other functions | 77 | * 2.0: PWM seems to be stable and is not interfering with the other functions |
78 | * 2.1: changed PWM API | 78 | * 2.1: changed PWM API |
79 | * 2.2: added firmware kernel request to fix an udev problem | 79 | * 2.2: added firmware kernel request to fix an udev problem |
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 294e9b40f516..737f4a9d86a3 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c | |||
@@ -736,7 +736,7 @@ DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize, | |||
736 | case 4: | 736 | case 4: |
737 | break; | 737 | break; |
738 | default: | 738 | default: |
739 | /* alignment value not suportted */ | 739 | /* alignment value not supportted */ |
740 | status = -EPERM; | 740 | status = -EPERM; |
741 | break; | 741 | break; |
742 | } | 742 | } |
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c index ff6fd4fb624d..0f03b7919d7c 100644 --- a/drivers/target/iscsi/iscsi_target_configfs.c +++ b/drivers/target/iscsi/iscsi_target_configfs.c | |||
@@ -235,7 +235,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg( | |||
235 | * iSER/SCTP (TODO, software emulation with osc-iwarp) | 235 | * iSER/SCTP (TODO, software emulation with osc-iwarp) |
236 | * iSER/IB (TODO, hardware available) | 236 | * iSER/IB (TODO, hardware available) |
237 | * | 237 | * |
238 | * can be enabled with atributes under | 238 | * can be enabled with attributes under |
239 | * sys/kernel/config/iscsi/$IQN/$TPG/np/$IP:$PORT/ | 239 | * sys/kernel/config/iscsi/$IQN/$TPG/np/$IP:$PORT/ |
240 | * | 240 | * |
241 | */ | 241 | */ |
diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c index 8aacf611b86d..8e6298cc8839 100644 --- a/drivers/target/iscsi/iscsi_target_erl0.c +++ b/drivers/target/iscsi/iscsi_target_erl0.c | |||
@@ -410,11 +410,11 @@ static int iscsit_dataout_pre_datapduinorder_yes( | |||
410 | /* | 410 | /* |
411 | * For DataSequenceInOrder=Yes: If the offset is greater than the global | 411 | * For DataSequenceInOrder=Yes: If the offset is greater than the global |
412 | * DataPDUInOrder=Yes offset counter in struct iscsi_cmd a protcol error has | 412 | * DataPDUInOrder=Yes offset counter in struct iscsi_cmd a protcol error has |
413 | * occured and fail the connection. | 413 | * occurred and fail the connection. |
414 | * | 414 | * |
415 | * For DataSequenceInOrder=No: If the offset is greater than the per | 415 | * For DataSequenceInOrder=No: If the offset is greater than the per |
416 | * sequence DataPDUInOrder=Yes offset counter in struct iscsi_seq a protocol | 416 | * sequence DataPDUInOrder=Yes offset counter in struct iscsi_seq a protocol |
417 | * error has occured and fail the connection. | 417 | * error has occurred and fail the connection. |
418 | */ | 418 | */ |
419 | if (conn->sess->sess_ops->DataSequenceInOrder) { | 419 | if (conn->sess->sess_ops->DataSequenceInOrder) { |
420 | if (be32_to_cpu(hdr->offset) != cmd->write_data_done) { | 420 | if (be32_to_cpu(hdr->offset) != cmd->write_data_done) { |
@@ -801,7 +801,7 @@ void iscsit_start_time2retain_handler(struct iscsi_session *sess) | |||
801 | { | 801 | { |
802 | int tpg_active; | 802 | int tpg_active; |
803 | /* | 803 | /* |
804 | * Only start Time2Retain timer when the assoicated TPG is still in | 804 | * Only start Time2Retain timer when the associated TPG is still in |
805 | * an ACTIVE (eg: not disabled or shutdown) state. | 805 | * an ACTIVE (eg: not disabled or shutdown) state. |
806 | */ | 806 | */ |
807 | spin_lock(&ISCSI_TPG_S(sess)->tpg_state_lock); | 807 | spin_lock(&ISCSI_TPG_S(sess)->tpg_state_lock); |
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 90b740048f26..1bf7432bfcbc 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c | |||
@@ -1432,6 +1432,7 @@ static struct iscsi_param *iscsi_check_key( | |||
1432 | break; | 1432 | break; |
1433 | case PHASE_OPERATIONAL: | 1433 | case PHASE_OPERATIONAL: |
1434 | pr_debug("Operational phase.\n"); | 1434 | pr_debug("Operational phase.\n"); |
1435 | break; | ||
1435 | default: | 1436 | default: |
1436 | pr_debug("Unknown phase.\n"); | 1437 | pr_debug("Unknown phase.\n"); |
1437 | } | 1438 | } |
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 1a91195ab619..69e0cfd98870 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c | |||
@@ -684,7 +684,7 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd) | |||
684 | void iscsit_free_cmd(struct iscsi_cmd *cmd) | 684 | void iscsit_free_cmd(struct iscsi_cmd *cmd) |
685 | { | 685 | { |
686 | /* | 686 | /* |
687 | * Determine if a struct se_cmd is assoicated with | 687 | * Determine if a struct se_cmd is associated with |
688 | * this struct iscsi_cmd. | 688 | * this struct iscsi_cmd. |
689 | */ | 689 | */ |
690 | switch (cmd->iscsi_opcode) { | 690 | switch (cmd->iscsi_opcode) { |
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 8636fae1f7ec..c2c77d1ac499 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig | |||
@@ -98,7 +98,7 @@ config EXYNOS_THERMAL | |||
98 | depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) | 98 | depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) |
99 | depends on CPU_THERMAL | 99 | depends on CPU_THERMAL |
100 | help | 100 | help |
101 | If you say yes here you get support for TMU (Thermal Managment | 101 | If you say yes here you get support for TMU (Thermal Management |
102 | Unit) on SAMSUNG EXYNOS series of SoC. | 102 | Unit) on SAMSUNG EXYNOS series of SoC. |
103 | 103 | ||
104 | config DB8500_THERMAL | 104 | config DB8500_THERMAL |
diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c index be1a9a1e749e..cd69b48f6dfd 100644 --- a/drivers/tty/hvc/hvc_opal.c +++ b/drivers/tty/hvc/hvc_opal.c | |||
@@ -178,7 +178,7 @@ static int hvc_opal_probe(struct platform_device *dev) | |||
178 | proto = HV_PROTOCOL_HVSI; | 178 | proto = HV_PROTOCOL_HVSI; |
179 | ops = &hvc_opal_hvsi_ops; | 179 | ops = &hvc_opal_hvsi_ops; |
180 | } else { | 180 | } else { |
181 | pr_err("hvc_opal: Unkown protocol for %s\n", | 181 | pr_err("hvc_opal: Unknown protocol for %s\n", |
182 | dev->dev.of_node->full_name); | 182 | dev->dev.of_node->full_name); |
183 | return -ENXIO; | 183 | return -ENXIO; |
184 | } | 184 | } |
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index ed6f5f1f5a55..0c629807610e 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c | |||
@@ -313,7 +313,7 @@ static int hvc_vio_probe(struct vio_dev *vdev, | |||
313 | proto = HV_PROTOCOL_HVSI; | 313 | proto = HV_PROTOCOL_HVSI; |
314 | ops = &hvterm_hvsi_ops; | 314 | ops = &hvterm_hvsi_ops; |
315 | } else { | 315 | } else { |
316 | pr_err("hvc_vio: Unkown protocol for %s\n", vdev->dev.of_node->full_name); | 316 | pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name); |
317 | return -ENXIO; | 317 | return -ENXIO; |
318 | } | 318 | } |
319 | 319 | ||
diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h index 9d6bcc77c73c..002c34e72521 100644 --- a/drivers/tty/ipwireless/setup_protocol.h +++ b/drivers/tty/ipwireless/setup_protocol.h | |||
@@ -59,7 +59,7 @@ struct tl_setup_config_done_msg { | |||
59 | unsigned char sig_no; /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */ | 59 | unsigned char sig_no; /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */ |
60 | } __attribute__ ((__packed__)); | 60 | } __attribute__ ((__packed__)); |
61 | 61 | ||
62 | /* Asyncronous messages */ | 62 | /* Asynchronous messages */ |
63 | struct tl_setup_open_msg { | 63 | struct tl_setup_open_msg { |
64 | unsigned char sig_no; /* TL_SETUP_SIGNO_OPEN_MSG */ | 64 | unsigned char sig_no; /* TL_SETUP_SIGNO_OPEN_MSG */ |
65 | unsigned char port_no; | 65 | unsigned char port_no; |
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index f3d283f2e3aa..c31133a6ea8e 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig | |||
@@ -271,7 +271,7 @@ config SERIAL_8250_DW | |||
271 | present in the Synopsys DesignWare APB UART. | 271 | present in the Synopsys DesignWare APB UART. |
272 | 272 | ||
273 | config SERIAL_8250_EM | 273 | config SERIAL_8250_EM |
274 | tristate "Support for Emma Mobile intergrated serial port" | 274 | tristate "Support for Emma Mobile integrated serial port" |
275 | depends on SERIAL_8250 && ARM && HAVE_CLK | 275 | depends on SERIAL_8250 && ARM && HAVE_CLK |
276 | help | 276 | help |
277 | Selecting this option will add support for the integrated serial | 277 | Selecting this option will add support for the integrated serial |
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c index e6a008f4939f..2e2b2c1cb722 100644 --- a/drivers/tty/serial/bfin_uart.c +++ b/drivers/tty/serial/bfin_uart.c | |||
@@ -815,7 +815,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, | |||
815 | lcr = WLS(5); | 815 | lcr = WLS(5); |
816 | break; | 816 | break; |
817 | default: | 817 | default: |
818 | printk(KERN_ERR "%s: word lengh not supported\n", | 818 | printk(KERN_ERR "%s: word length not supported\n", |
819 | __func__); | 819 | __func__); |
820 | } | 820 | } |
821 | 821 | ||
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index 6197a69adb4d..72b6334bcf1a 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c | |||
@@ -505,7 +505,7 @@ static void load_code(struct icom_port *icom_port) | |||
505 | /* Stop processor */ | 505 | /* Stop processor */ |
506 | stop_processor(icom_port); | 506 | stop_processor(icom_port); |
507 | 507 | ||
508 | dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n"); | 508 | dev_err(&icom_port->adapter->pci_dev->dev,"Port not operational\n"); |
509 | } | 509 | } |
510 | 510 | ||
511 | if (new_page != NULL) | 511 | if (new_page != NULL) |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 88dde95b6795..d938b2b99e31 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -222,7 +222,7 @@ static int usb_probe_device(struct device *dev) | |||
222 | /* TODO: Add real matching code */ | 222 | /* TODO: Add real matching code */ |
223 | 223 | ||
224 | /* The device should always appear to be in use | 224 | /* The device should always appear to be in use |
225 | * unless the driver suports autosuspend. | 225 | * unless the driver supports autosuspend. |
226 | */ | 226 | */ |
227 | if (!udriver->supports_autosuspend) | 227 | if (!udriver->supports_autosuspend) |
228 | error = usb_autoresume_device(udev); | 228 | error = usb_autoresume_device(udev); |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 59dcea2f6957..f4a21f6f081f 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -51,7 +51,7 @@ | |||
51 | * full speed USB controllers, including the at91rm9200 (arm920T, with MMU), | 51 | * full speed USB controllers, including the at91rm9200 (arm920T, with MMU), |
52 | * at91sam926x (arm926ejs, with MMU), and several no-mmu versions. | 52 | * at91sam926x (arm926ejs, with MMU), and several no-mmu versions. |
53 | * | 53 | * |
54 | * This driver expects the board has been wired with two GPIOs suppporting | 54 | * This driver expects the board has been wired with two GPIOs supporting |
55 | * a VBUS sensing IRQ, and a D+ pullup. (They may be omitted, but the | 55 | * a VBUS sensing IRQ, and a D+ pullup. (They may be omitted, but the |
56 | * testing hasn't covered such cases.) | 56 | * testing hasn't covered such cases.) |
57 | * | 57 | * |
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index ea5f2586fbdd..6c3586a4c956 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
@@ -883,7 +883,7 @@ static void rts51x_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
883 | } else { | 883 | } else { |
884 | US_DEBUGP("%s: NOT working scsi, not SS\n", __func__); | 884 | US_DEBUGP("%s: NOT working scsi, not SS\n", __func__); |
885 | chip->proto_handler_backup(srb, us); | 885 | chip->proto_handler_backup(srb, us); |
886 | /* Check wether card is plugged in */ | 886 | /* Check whether card is plugged in */ |
887 | if (srb->cmnd[0] == TEST_UNIT_READY) { | 887 | if (srb->cmnd[0] == TEST_UNIT_READY) { |
888 | if (srb->result == SAM_STAT_GOOD) { | 888 | if (srb->result == SAM_STAT_GOOD) { |
889 | SET_LUN_READY(chip, srb->device->lun); | 889 | SET_LUN_READY(chip, srb->device->lun); |
diff --git a/drivers/vhost/tcm_vhost.c b/drivers/vhost/tcm_vhost.c index 79e7e4d45eb2..d670130ee687 100644 --- a/drivers/vhost/tcm_vhost.c +++ b/drivers/vhost/tcm_vhost.c | |||
@@ -230,7 +230,7 @@ static struct se_node_acl *tcm_vhost_alloc_fabric_acl( | |||
230 | 230 | ||
231 | nacl = kzalloc(sizeof(struct tcm_vhost_nacl), GFP_KERNEL); | 231 | nacl = kzalloc(sizeof(struct tcm_vhost_nacl), GFP_KERNEL); |
232 | if (!nacl) { | 232 | if (!nacl) { |
233 | pr_err("Unable to alocate struct tcm_vhost_nacl\n"); | 233 | pr_err("Unable to allocate struct tcm_vhost_nacl\n"); |
234 | return NULL; | 234 | return NULL; |
235 | } | 235 | } |
236 | 236 | ||
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 5b06d31ab6a9..c0bc92d8e438 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -212,7 +212,7 @@ static long booke_wdt_ioctl(struct file *file, | |||
212 | return 0; | 212 | return 0; |
213 | } | 213 | } |
214 | 214 | ||
215 | /* wdt_is_active stores wether or not the /dev/watchdog device is opened */ | 215 | /* wdt_is_active stores whether or not the /dev/watchdog device is opened */ |
216 | static unsigned long wdt_is_active; | 216 | static unsigned long wdt_is_active; |
217 | 217 | ||
218 | static int booke_wdt_open(struct inode *inode, struct file *file) | 218 | static int booke_wdt_open(struct inode *inode, struct file *file) |
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 961d664e2d2f..68dcc59cd287 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c | |||
@@ -360,7 +360,7 @@ static int __devinit pcistub_init_device(struct pci_dev *dev) | |||
360 | if (!dev_data->pci_saved_state) | 360 | if (!dev_data->pci_saved_state) |
361 | dev_err(&dev->dev, "Could not store PCI conf saved state!\n"); | 361 | dev_err(&dev->dev, "Could not store PCI conf saved state!\n"); |
362 | else { | 362 | else { |
363 | dev_dbg(&dev->dev, "reseting (FLR, D3, etc) the device\n"); | 363 | dev_dbg(&dev->dev, "resetting (FLR, D3, etc) the device\n"); |
364 | __pci_reset_function_locked(dev); | 364 | __pci_reset_function_locked(dev); |
365 | pci_restore_state(dev); | 365 | pci_restore_state(dev); |
366 | } | 366 | } |
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index c72ead869507..596617ecd329 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -413,7 +413,7 @@ struct btrfs_root_backup { | |||
413 | __le64 bytes_used; | 413 | __le64 bytes_used; |
414 | __le64 num_devices; | 414 | __le64 num_devices; |
415 | /* future */ | 415 | /* future */ |
416 | __le64 unsed_64[4]; | 416 | __le64 unused_64[4]; |
417 | 417 | ||
418 | u8 tree_root_level; | 418 | u8 tree_root_level; |
419 | u8 chunk_root_level; | 419 | u8 chunk_root_level; |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3d3e2c17d8d1..06b2635073f3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -3888,7 +3888,7 @@ static int flush_space(struct btrfs_root *root, | |||
3888 | * @root - the root we're allocating for | 3888 | * @root - the root we're allocating for |
3889 | * @block_rsv - the block_rsv we're allocating for | 3889 | * @block_rsv - the block_rsv we're allocating for |
3890 | * @orig_bytes - the number of bytes we want | 3890 | * @orig_bytes - the number of bytes we want |
3891 | * @flush - wether or not we can flush to make our reservation | 3891 | * @flush - whether or not we can flush to make our reservation |
3892 | * | 3892 | * |
3893 | * This will reserve orgi_bytes number of bytes from the space info associated | 3893 | * This will reserve orgi_bytes number of bytes from the space info associated |
3894 | * with the block_rsv. If there is not enough space it will make an attempt to | 3894 | * with the block_rsv. If there is not enough space it will make an attempt to |
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index b8cbc8d5c7f7..ce9f79216723 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
@@ -234,12 +234,11 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) | |||
234 | } | 234 | } |
235 | 235 | ||
236 | /** | 236 | /** |
237 | * unpint_extent_cache - unpin an extent from the cache | 237 | * unpin_extent_cache - unpin an extent from the cache |
238 | * @tree: tree to unpin the extent in | 238 | * @tree: tree to unpin the extent in |
239 | * @start: logical offset in the file | 239 | * @start: logical offset in the file |
240 | * @len: length of the extent | 240 | * @len: length of the extent |
241 | * @gen: generation that this extent has been modified in | 241 | * @gen: generation that this extent has been modified in |
242 | * @prealloc: if this is set we need to clear the prealloc flag | ||
243 | * | 242 | * |
244 | * Called after an extent has been written to disk properly. Set the generation | 243 | * Called after an extent has been written to disk properly. Set the generation |
245 | * to the generation that actually added the file item to the inode so we know | 244 | * to the generation that actually added the file item to the inode so we know |
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index dd27a0b46a37..853fc7beedfa 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -76,7 +76,7 @@ struct btrfs_ordered_sum { | |||
76 | 76 | ||
77 | #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ | 77 | #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ |
78 | 78 | ||
79 | #define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates wether this ordered extent | 79 | #define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates whether this ordered extent |
80 | * has done its due diligence in updating | 80 | * has done its due diligence in updating |
81 | * the isize. */ | 81 | * the isize. */ |
82 | 82 | ||
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 0f5ebb72a5ea..e3c6ee3cc2ba 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -4294,7 +4294,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, | |||
4294 | 4294 | ||
4295 | rcu_read_lock(); | 4295 | rcu_read_lock(); |
4296 | name = rcu_dereference(dev->name); | 4296 | name = rcu_dereference(dev->name); |
4297 | pr_debug("btrfs_map_bio: rw %d, secor=%llu, dev=%lu " | 4297 | pr_debug("btrfs_map_bio: rw %d, sector=%llu, dev=%lu " |
4298 | "(%s id %llu), size=%u\n", rw, | 4298 | "(%s id %llu), size=%u\n", rw, |
4299 | (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev, | 4299 | (u64)bio->bi_sector, (u_long)dev->bdev->bd_dev, |
4300 | name->str, dev->devid, bio->bi_size); | 4300 | name->str, dev->devid, bio->bi_size); |
diff --git a/fs/cifs/README b/fs/cifs/README index 22ab7b5b8da7..2d5622f60e11 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
@@ -480,7 +480,7 @@ A partial list of the supported mount options follows: | |||
480 | Unicode on the wire. | 480 | Unicode on the wire. |
481 | nomapchars Do not translate any of these seven characters (default). | 481 | nomapchars Do not translate any of these seven characters (default). |
482 | nocase Request case insensitive path name matching (case | 482 | nocase Request case insensitive path name matching (case |
483 | sensitive is the default if the server suports it). | 483 | sensitive is the default if the server supports it). |
484 | (mount option "ignorecase" is identical to "nocase") | 484 | (mount option "ignorecase" is identical to "nocase") |
485 | posixpaths If CIFS Unix extensions are supported, attempt to | 485 | posixpaths If CIFS Unix extensions are supported, attempt to |
486 | negotiate posix path name support which allows certain | 486 | negotiate posix path name support which allows certain |
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3c20de1d59d0..df163da388c9 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -2455,7 +2455,7 @@ TAS_BUFFER_FNS(Uninit, uninit) | |||
2455 | BUFFER_FNS(Da_Mapped, da_mapped) | 2455 | BUFFER_FNS(Da_Mapped, da_mapped) |
2456 | 2456 | ||
2457 | /* | 2457 | /* |
2458 | * Add new method to test wether block and inode bitmaps are properly | 2458 | * Add new method to test whether block and inode bitmaps are properly |
2459 | * initialized. With uninit_bg reading the block from disk is not enough | 2459 | * initialized. With uninit_bg reading the block from disk is not enough |
2460 | * to mark the bitmap uptodate. We need to also zero-out the bitmap | 2460 | * to mark the bitmap uptodate. We need to also zero-out the bitmap |
2461 | */ | 2461 | */ |
diff --git a/fs/fhandle.c b/fs/fhandle.c index f775bfdd6e4a..cccdc874bb55 100644 --- a/fs/fhandle.c +++ b/fs/fhandle.c | |||
@@ -22,7 +22,7 @@ static long do_sys_name_to_handle(struct path *path, | |||
22 | struct file_handle *handle = NULL; | 22 | struct file_handle *handle = NULL; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * We need t make sure wether the file system | 25 | * We need to make sure whether the file system |
26 | * support decoding of the file handle | 26 | * support decoding of the file handle |
27 | */ | 27 | */ |
28 | if (!path->dentry->d_sb->s_export_op || | 28 | if (!path->dentry->d_sb->s_export_op || |
@@ -40,7 +40,7 @@ static long do_sys_name_to_handle(struct path *path, | |||
40 | if (!handle) | 40 | if (!handle) |
41 | return -ENOMEM; | 41 | return -ENOMEM; |
42 | 42 | ||
43 | /* convert handle size to multiple of sizeof(u32) */ | 43 | /* convert handle size to multiple of sizeof(u32) */ |
44 | handle_dwords = f_handle.handle_bytes >> 2; | 44 | handle_dwords = f_handle.handle_bytes >> 2; |
45 | 45 | ||
46 | /* we ask for a non connected handle */ | 46 | /* we ask for a non connected handle */ |
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 4a55f35a6ced..78bde32ea951 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * hugetlbpage-backed filesystem. Based on ramfs. | 2 | * hugetlbpage-backed filesystem. Based on ramfs. |
3 | * | 3 | * |
4 | * William Irwin, 2002 | 4 | * Nadia Yvette Chambers, 2002 |
5 | * | 5 | * |
6 | * Copyright (C) 2002 Linus Torvalds. | 6 | * Copyright (C) 2002 Linus Torvalds. |
7 | */ | 7 | */ |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 7f5120bf0ec2..071d6905f0dd 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1259,7 +1259,7 @@ int journal_forget (handle_t *handle, struct buffer_head *bh) | |||
1259 | goto not_jbd; | 1259 | goto not_jbd; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /* keep track of wether or not this transaction modified us */ | 1262 | /* keep track of whether or not this transaction modified us */ |
1263 | was_modified = jh->b_modified; | 1263 | was_modified = jh->b_modified; |
1264 | 1264 | ||
1265 | /* | 1265 | /* |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index a74ba4659549..d8da40e99d84 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -1261,7 +1261,7 @@ int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh) | |||
1261 | goto not_jbd; | 1261 | goto not_jbd; |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | /* keep track of wether or not this transaction modified us */ | 1264 | /* keep track of whether or not this transaction modified us */ |
1265 | was_modified = jh->b_modified; | 1265 | was_modified = jh->b_modified; |
1266 | 1266 | ||
1267 | /* | 1267 | /* |
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c index adb90116d36b..af49e2d6941a 100644 --- a/fs/logfs/inode.c +++ b/fs/logfs/inode.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * are being written out - and waiting for GC to make progress, naturally. | 33 | * are being written out - and waiting for GC to make progress, naturally. |
34 | * | 34 | * |
35 | * So we cannot just call iget() or some variant of it, but first have to check | 35 | * So we cannot just call iget() or some variant of it, but first have to check |
36 | * wether the inode in question might be in I_FREEING state. Therefore we | 36 | * whether the inode in question might be in I_FREEING state. Therefore we |
37 | * maintain our own per-sb list of "almost deleted" inodes and check against | 37 | * maintain our own per-sb list of "almost deleted" inodes and check against |
38 | * that list first. Normally this should be at most 1-2 entries long. | 38 | * that list first. Normally this should be at most 1-2 entries long. |
39 | * | 39 | * |
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index be20a7e171a0..63d14a99483d 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c | |||
@@ -89,7 +89,7 @@ static int ncp_file_mmap_fault(struct vm_area_struct *area, | |||
89 | /* | 89 | /* |
90 | * If I understand ncp_read_kernel() properly, the above always | 90 | * If I understand ncp_read_kernel() properly, the above always |
91 | * fetches from the network, here the analogue of disk. | 91 | * fetches from the network, here the analogue of disk. |
92 | * -- wli | 92 | * -- nyc |
93 | */ | 93 | */ |
94 | count_vm_event(PGMAJFAULT); | 94 | count_vm_event(PGMAJFAULT); |
95 | mem_cgroup_count_vm_event(area->vm_mm, PGMAJFAULT); | 95 | mem_cgroup_count_vm_event(area->vm_mm, PGMAJFAULT); |
diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig index 7dceff005a67..e5f911bd80d2 100644 --- a/fs/notify/fanotify/Kconfig +++ b/fs/notify/fanotify/Kconfig | |||
@@ -4,7 +4,7 @@ config FANOTIFY | |||
4 | select ANON_INODES | 4 | select ANON_INODES |
5 | default n | 5 | default n |
6 | ---help--- | 6 | ---help--- |
7 | Say Y here to enable fanotify suport. fanotify is a file access | 7 | Say Y here to enable fanotify support. fanotify is a file access |
8 | notification system which differs from inotify in that it sends | 8 | notification system which differs from inotify in that it sends |
9 | an open file descriptor to the userspace listener along with | 9 | an open file descriptor to the userspace listener along with |
10 | the event. | 10 | the event. |
diff --git a/fs/notify/notification.c b/fs/notify/notification.c index c887b1378f7e..48cb994e4922 100644 --- a/fs/notify/notification.c +++ b/fs/notify/notification.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | /* | 19 | /* |
20 | * Basic idea behind the notification queue: An fsnotify group (like inotify) | 20 | * Basic idea behind the notification queue: An fsnotify group (like inotify) |
21 | * sends the userspace notification about events asyncronously some time after | 21 | * sends the userspace notification about events asynchronously some time after |
22 | * the event happened. When inotify gets an event it will need to add that | 22 | * the event happened. When inotify gets an event it will need to add that |
23 | * event to the group notify queue. Since a single event might need to be on | 23 | * event to the group notify queue. Since a single event might need to be on |
24 | * multiple group's notification queues we can't add the event directly to each | 24 | * multiple group's notification queues we can't add the event directly to each |
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index 1d47dcce11e1..d02da2c6fc1a 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h | |||
@@ -98,7 +98,7 @@ int dlm_release_lockspace(dlm_lockspace_t *lockspace, int force); | |||
98 | /* | 98 | /* |
99 | * dlm_lock | 99 | * dlm_lock |
100 | * | 100 | * |
101 | * Make an asyncronous request to acquire or convert a lock on a named | 101 | * Make an asynchronous request to acquire or convert a lock on a named |
102 | * resource. | 102 | * resource. |
103 | * | 103 | * |
104 | * lockspace: context for the request | 104 | * lockspace: context for the request |
diff --git a/include/linux/hash.h b/include/linux/hash.h index 24df9e70406f..61c97ae22e01 100644 --- a/include/linux/hash.h +++ b/include/linux/hash.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _LINUX_HASH_H | 1 | #ifndef _LINUX_HASH_H |
2 | #define _LINUX_HASH_H | 2 | #define _LINUX_HASH_H |
3 | /* Fast hashing routine for ints, longs and pointers. | 3 | /* Fast hashing routine for ints, longs and pointers. |
4 | (C) 2002 William Lee Irwin III, IBM */ | 4 | (C) 2002 Nadia Yvette Chambers, IBM */ |
5 | 5 | ||
6 | /* | 6 | /* |
7 | * Knuth recommends primes in approximately golden ratio to the maximum | 7 | * Knuth recommends primes in approximately golden ratio to the maximum |
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index fcb5d44ea635..8ea3fe0b9759 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h | |||
@@ -216,7 +216,7 @@ int ipmi_unregister_smi(ipmi_smi_t intf); | |||
216 | 216 | ||
217 | /* | 217 | /* |
218 | * The lower layer reports received messages through this interface. | 218 | * The lower layer reports received messages through this interface. |
219 | * The data_size should be zero if this is an asyncronous message. If | 219 | * The data_size should be zero if this is an asynchronous message. If |
220 | * the lower layer gets an error sending a message, it should format | 220 | * the lower layer gets an error sending a message, it should format |
221 | * an error response in the message response. | 221 | * an error response in the message response. |
222 | */ | 222 | */ |
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h index 7a71ffad037c..cafc7f99e124 100644 --- a/include/linux/lru_cache.h +++ b/include/linux/lru_cache.h | |||
@@ -52,8 +52,8 @@ We replicate IO (more or less synchronously) to local and remote disk. | |||
52 | 52 | ||
53 | For crash recovery after replication node failure, | 53 | For crash recovery after replication node failure, |
54 | we need to resync all regions that have been target of in-flight WRITE IO | 54 | we need to resync all regions that have been target of in-flight WRITE IO |
55 | (in use, or "hot", regions), as we don't know wether or not those WRITEs have | 55 | (in use, or "hot", regions), as we don't know whether or not those WRITEs |
56 | made it to stable storage. | 56 | have made it to stable storage. |
57 | 57 | ||
58 | To avoid a "full resync", we need to persistently track these regions. | 58 | To avoid a "full resync", we need to persistently track these regions. |
59 | 59 | ||
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ef9336c9d464..02e0f6b156c3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -369,7 +369,7 @@ typedef enum gro_result gro_result_t; | |||
369 | * | 369 | * |
370 | * If the rx_handler consider the skb should be ignored, it should return | 370 | * If the rx_handler consider the skb should be ignored, it should return |
371 | * RX_HANDLER_EXACT. The skb will only be delivered to protocol handlers that | 371 | * RX_HANDLER_EXACT. The skb will only be delivered to protocol handlers that |
372 | * are registred on exact device (ptype->dev == skb->dev). | 372 | * are registered on exact device (ptype->dev == skb->dev). |
373 | * | 373 | * |
374 | * If the rx_handler didn't changed skb->dev, but want the skb to be normally | 374 | * If the rx_handler didn't changed skb->dev, but want the skb to be normally |
375 | * delivered, it should return RX_HANDLER_PASS. | 375 | * delivered, it should return RX_HANDLER_PASS. |
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index de5b2f8176ce..c1b3ed3fb787 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h | |||
@@ -61,7 +61,7 @@ | |||
61 | #define STMMAC_CSR_I_16 0xE /* clk_csr_i/16 */ | 61 | #define STMMAC_CSR_I_16 0xE /* clk_csr_i/16 */ |
62 | #define STMMAC_CSR_I_18 0xF /* clk_csr_i/18 */ | 62 | #define STMMAC_CSR_I_18 0xF /* clk_csr_i/18 */ |
63 | 63 | ||
64 | /* AXI DMA Burst length suported */ | 64 | /* AXI DMA Burst length supported */ |
65 | #define DMA_AXI_BLEN_4 (1 << 1) | 65 | #define DMA_AXI_BLEN_4 (1 << 1) |
66 | #define DMA_AXI_BLEN_8 (1 << 2) | 66 | #define DMA_AXI_BLEN_8 (1 << 2) |
67 | #define DMA_AXI_BLEN_16 (1 << 3) | 67 | #define DMA_AXI_BLEN_16 (1 << 3) |
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 0ee42d9acdc0..2c02f3a8d2ba 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
@@ -78,7 +78,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev, | |||
78 | * This function acquires VGA resources for the given | 78 | * This function acquires VGA resources for the given |
79 | * card and mark those resources locked. If the resource requested | 79 | * card and mark those resources locked. If the resource requested |
80 | * are "normal" (and not legacy) resources, the arbiter will first check | 80 | * are "normal" (and not legacy) resources, the arbiter will first check |
81 | * wether the card is doing legacy decoding for that type of resource. If | 81 | * whether the card is doing legacy decoding for that type of resource. If |
82 | * yes, the lock is "converted" into a legacy resource lock. | 82 | * yes, the lock is "converted" into a legacy resource lock. |
83 | * The arbiter will first look for all VGA cards that might conflict | 83 | * The arbiter will first look for all VGA cards that might conflict |
84 | * and disable their IOs and/or Memory access, including VGA forwarding | 84 | * and disable their IOs and/or Memory access, including VGA forwarding |
@@ -89,7 +89,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev, | |||
89 | * This function will block if some conflicting card is already locking | 89 | * This function will block if some conflicting card is already locking |
90 | * one of the required resources (or any resource on a different bus | 90 | * one of the required resources (or any resource on a different bus |
91 | * segment, since P2P bridges don't differenciate VGA memory and IO | 91 | * segment, since P2P bridges don't differenciate VGA memory and IO |
92 | * afaik). You can indicate wether this blocking should be interruptible | 92 | * afaik). You can indicate whether this blocking should be interruptible |
93 | * by a signal (for userland interface) or not. | 93 | * by a signal (for userland interface) or not. |
94 | * Must not be called at interrupt time or in atomic context. | 94 | * Must not be called at interrupt time or in atomic context. |
95 | * If the card already owns the resources, the function succeeds. | 95 | * If the card already owns the resources, the function succeeds. |
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index b7f45d48b2de..87490ac4bd87 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h | |||
@@ -105,7 +105,7 @@ struct watchdog_device { | |||
105 | #define WATCHDOG_NOWAYOUT_INIT_STATUS 0 | 105 | #define WATCHDOG_NOWAYOUT_INIT_STATUS 0 |
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | /* Use the following function to check wether or not the watchdog is active */ | 108 | /* Use the following function to check whether or not the watchdog is active */ |
109 | static inline bool watchdog_active(struct watchdog_device *wdd) | 109 | static inline bool watchdog_active(struct watchdog_device *wdd) |
110 | { | 110 | { |
111 | return test_bit(WDOG_ACTIVE, &wdd->status); | 111 | return test_bit(WDOG_ACTIVE, &wdd->status); |
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index fff11b7fe8a4..591f78631f13 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
@@ -134,7 +134,7 @@ typedef struct { | |||
134 | } CACHE_ENTRY; | 134 | } CACHE_ENTRY; |
135 | 135 | ||
136 | /* | 136 | /* |
137 | * Information about each registred IrLAP layer | 137 | * Information about each registered IrLAP layer |
138 | */ | 138 | */ |
139 | struct lap_cb { | 139 | struct lap_cb { |
140 | irda_queue_t queue; /* Must be first */ | 140 | irda_queue_t queue; /* Must be first */ |
diff --git a/include/net/sock.h b/include/net/sock.h index 0a9a01a5b0d7..93a6745bfdb2 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -231,7 +231,7 @@ struct cg_proto; | |||
231 | * @sk_sndbuf: size of send buffer in bytes | 231 | * @sk_sndbuf: size of send buffer in bytes |
232 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, | 232 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, |
233 | * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings | 233 | * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings |
234 | * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets | 234 | * @sk_no_check: %SO_NO_CHECK setting, whether or not checkup packets |
235 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) | 235 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) |
236 | * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) | 236 | * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) |
237 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) | 237 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) |
diff --git a/kernel/pid.c b/kernel/pid.c index aebd4f5aaf41..fd996c1ed9f8 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * Generic pidhash and scalable, time-bounded PID allocator | 2 | * Generic pidhash and scalable, time-bounded PID allocator |
3 | * | 3 | * |
4 | * (C) 2002-2003 William Irwin, IBM | 4 | * (C) 2002-2003 Nadia Yvette Chambers, IBM |
5 | * (C) 2004 William Irwin, Oracle | 5 | * (C) 2004 Nadia Yvette Chambers, Oracle |
6 | * (C) 2002-2004 Ingo Molnar, Red Hat | 6 | * (C) 2002-2004 Ingo Molnar, Red Hat |
7 | * | 7 | * |
8 | * pid-structures are backing objects for tasks sharing a given ID to chain | 8 | * pid-structures are backing objects for tasks sharing a given ID to chain |
diff --git a/kernel/profile.c b/kernel/profile.c index 76b8e77773ee..1f391819c42f 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
@@ -8,9 +8,10 @@ | |||
8 | * Scheduler profiling support, Arjan van de Ven and Ingo Molnar, | 8 | * Scheduler profiling support, Arjan van de Ven and Ingo Molnar, |
9 | * Red Hat, July 2004 | 9 | * Red Hat, July 2004 |
10 | * Consolidation of architecture support code for profiling, | 10 | * Consolidation of architecture support code for profiling, |
11 | * William Irwin, Oracle, July 2004 | 11 | * Nadia Yvette Chambers, Oracle, July 2004 |
12 | * Amortized hit count accounting via per-cpu open-addressed hashtables | 12 | * Amortized hit count accounting via per-cpu open-addressed hashtables |
13 | * to resolve timer interrupt livelocks, William Irwin, Oracle, 2004 | 13 | * to resolve timer interrupt livelocks, Nadia Yvette Chambers, |
14 | * Oracle, 2004 | ||
14 | */ | 15 | */ |
15 | 16 | ||
16 | #include <linux/export.h> | 17 | #include <linux/export.h> |
@@ -256,7 +257,7 @@ EXPORT_SYMBOL_GPL(unregister_timer_hook); | |||
256 | * pagetable hash functions, but uses a full hashtable full of finite | 257 | * pagetable hash functions, but uses a full hashtable full of finite |
257 | * collision chains, not just pairs of them. | 258 | * collision chains, not just pairs of them. |
258 | * | 259 | * |
259 | * -- wli | 260 | * -- nyc |
260 | */ | 261 | */ |
261 | static void __profile_flip_buffers(void *unused) | 262 | static void __profile_flip_buffers(void *unused) |
262 | { | 263 | { |
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 7693aaf324c6..afd092de45b7 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * Based on code in the latency_tracer, that is: | 10 | * Based on code in the latency_tracer, that is: |
11 | * | 11 | * |
12 | * Copyright (C) 2004-2006 Ingo Molnar | 12 | * Copyright (C) 2004-2006 Ingo Molnar |
13 | * Copyright (C) 2004 William Lee Irwin III | 13 | * Copyright (C) 2004 Nadia Yvette Chambers |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/stop_machine.h> | 16 | #include <linux/stop_machine.h> |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index b69cc380322d..61e081b4ba11 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Based on code from the latency_tracer, that is: | 10 | * Based on code from the latency_tracer, that is: |
11 | * Copyright (C) 2004-2006 Ingo Molnar | 11 | * Copyright (C) 2004-2006 Ingo Molnar |
12 | * Copyright (C) 2004 William Lee Irwin III | 12 | * Copyright (C) 2004 Nadia Yvette Chambers |
13 | */ | 13 | */ |
14 | #include <linux/ring_buffer.h> | 14 | #include <linux/ring_buffer.h> |
15 | #include <generated/utsrelease.h> | 15 | #include <generated/utsrelease.h> |
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index bb227e380cb5..8e3ad8082ab7 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Based on code from the latency_tracer, that is: | 7 | * Based on code from the latency_tracer, that is: |
8 | * | 8 | * |
9 | * Copyright (C) 2004-2006 Ingo Molnar | 9 | * Copyright (C) 2004-2006 Ingo Molnar |
10 | * Copyright (C) 2004 William Lee Irwin III | 10 | * Copyright (C) 2004 Nadia Yvette Chambers |
11 | */ | 11 | */ |
12 | #include <linux/ring_buffer.h> | 12 | #include <linux/ring_buffer.h> |
13 | #include <linux/debugfs.h> | 13 | #include <linux/debugfs.h> |
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index 5ffce7b0f33c..713a2cac4881 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * From code in the latency_tracer, that is: | 7 | * From code in the latency_tracer, that is: |
8 | * | 8 | * |
9 | * Copyright (C) 2004-2006 Ingo Molnar | 9 | * Copyright (C) 2004-2006 Ingo Molnar |
10 | * Copyright (C) 2004 William Lee Irwin III | 10 | * Copyright (C) 2004 Nadia Yvette Chambers |
11 | */ | 11 | */ |
12 | #include <linux/kallsyms.h> | 12 | #include <linux/kallsyms.h> |
13 | #include <linux/debugfs.h> | 13 | #include <linux/debugfs.h> |
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index bc64fc137554..9fe45fcefca0 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Based on code from the latency_tracer, that is: | 7 | * Based on code from the latency_tracer, that is: |
8 | * | 8 | * |
9 | * Copyright (C) 2004-2006 Ingo Molnar | 9 | * Copyright (C) 2004-2006 Ingo Molnar |
10 | * Copyright (C) 2004 William Lee Irwin III | 10 | * Copyright (C) 2004 Nadia Yvette Chambers |
11 | */ | 11 | */ |
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
diff --git a/kernel/wait.c b/kernel/wait.c index 7fdd9eaca2c3..6698e0c04ead 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Generic waiting primitives. | 2 | * Generic waiting primitives. |
3 | * | 3 | * |
4 | * (C) 2004 William Irwin, Oracle | 4 | * (C) 2004 Nadia Yvette Chambers, Oracle |
5 | */ | 5 | */ |
6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
7 | #include <linux/export.h> | 7 | #include <linux/export.h> |
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 41faf0b8df1d..e458782f3c52 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 06fdfa1aeba7..06f7e4fe8d2d 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
@@ -353,7 +353,7 @@ again: | |||
353 | EXPORT_SYMBOL(bitmap_find_next_zero_area); | 353 | EXPORT_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 | ||
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1ef2cd4ae3c9..34f372ad89d0 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Generic hugetlb support. | 2 | * Generic hugetlb support. |
3 | * (C) William Irwin, April 2004 | 3 | * (C) Nadia Yvette Chambers, April 2004 |
4 | */ | 4 | */ |
5 | #include <linux/list.h> | 5 | #include <linux/list.h> |
6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index de9cb14ae753..c3e66ae411fd 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -1230,10 +1230,10 @@ repeat: | |||
1230 | goto repeat; | 1230 | goto repeat; |
1231 | } | 1231 | } |
1232 | } | 1232 | } |
1233 | /* drain all zone's lru pagevec, this is asyncronous... */ | 1233 | /* drain all zone's lru pagevec, this is asynchronous... */ |
1234 | lru_add_drain_all(); | 1234 | lru_add_drain_all(); |
1235 | yield(); | 1235 | yield(); |
1236 | /* drain pcp pages , this is synchrouns. */ | 1236 | /* drain pcp pages, this is synchronous. */ |
1237 | drain_all_pages(); | 1237 | drain_all_pages(); |
1238 | /* check again */ | 1238 | /* check again */ |
1239 | offlined_pages = check_pages_isolated(start_pfn, end_pfn); | 1239 | offlined_pages = check_pages_isolated(start_pfn, end_pfn); |
@@ -1242,7 +1242,7 @@ repeat: | |||
1242 | goto failed_removal; | 1242 | goto failed_removal; |
1243 | } | 1243 | } |
1244 | printk(KERN_INFO "Offlined Pages %ld\n", offlined_pages); | 1244 | printk(KERN_INFO "Offlined Pages %ld\n", offlined_pages); |
1245 | /* Ok, all of our target is islaoted. | 1245 | /* Ok, all of our target is isolated. |
1246 | We cannot do rollback at this point. */ | 1246 | We cannot do rollback at this point. */ |
1247 | offline_isolated_pages(start_pfn, end_pfn); | 1247 | offline_isolated_pages(start_pfn, end_pfn); |
1248 | /* reset pagetype flags and makes migrate type to be MOVABLE */ | 1248 | /* reset pagetype flags and makes migrate type to be MOVABLE */ |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5a8d339d282a..eee3efa58c91 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -523,7 +523,7 @@ static inline int page_is_buddy(struct page *page, struct page *buddy, | |||
523 | * If a block is freed, and its buddy is also free, then this | 523 | * If a block is freed, and its buddy is also free, then this |
524 | * triggers coalescing into a block of larger size. | 524 | * triggers coalescing into a block of larger size. |
525 | * | 525 | * |
526 | * -- wli | 526 | * -- nyc |
527 | */ | 527 | */ |
528 | 528 | ||
529 | static inline void __free_one_page(struct page *page, | 529 | static inline void __free_one_page(struct page *page, |
@@ -782,7 +782,7 @@ void __init init_cma_reserved_pageblock(struct page *page) | |||
782 | * large block of memory acted on by a series of small allocations. | 782 | * large block of memory acted on by a series of small allocations. |
783 | * This behavior is a critical factor in sglist merging's success. | 783 | * This behavior is a critical factor in sglist merging's success. |
784 | * | 784 | * |
785 | * -- wli | 785 | * -- nyc |
786 | */ | 786 | */ |
787 | static inline void expand(struct zone *zone, struct page *page, | 787 | static inline void expand(struct zone *zone, struct page *page, |
788 | int low, int high, struct free_area *area, | 788 | int low, int high, struct free_area *area, |
@@ -152,7 +152,7 @@ EXPORT_SYMBOL(__krealloc); | |||
152 | * | 152 | * |
153 | * The contents of the object pointed to are preserved up to the | 153 | * The contents of the object pointed to are preserved up to the |
154 | * lesser of the new and old sizes. If @p is %NULL, krealloc() | 154 | * lesser of the new and old sizes. If @p is %NULL, krealloc() |
155 | * behaves exactly like kmalloc(). If @size is 0 and @p is not a | 155 | * behaves exactly like kmalloc(). If @new_size is 0 and @p is not a |
156 | * %NULL pointer, the object pointed to is freed. | 156 | * %NULL pointer, the object pointed to is freed. |
157 | */ | 157 | */ |
158 | void *krealloc(const void *p, size_t new_size, gfp_t flags) | 158 | void *krealloc(const void *p, size_t new_size, gfp_t flags) |
diff --git a/net/can/proc.c b/net/can/proc.c index 3b6dd3180492..ae566902d2bf 100644 --- a/net/can/proc.c +++ b/net/can/proc.c | |||
@@ -397,7 +397,7 @@ static inline void can_rcvlist_sff_proc_show_one(struct seq_file *m, | |||
397 | int i; | 397 | int i; |
398 | int all_empty = 1; | 398 | int all_empty = 1; |
399 | 399 | ||
400 | /* check wether at least one list is non-empty */ | 400 | /* check whether at least one list is non-empty */ |
401 | for (i = 0; i < 0x800; i++) | 401 | for (i = 0; i < 0x800; i++) |
402 | if (!hlist_empty(&d->rx_sff[i])) { | 402 | if (!hlist_empty(&d->rx_sff[i])) { |
403 | all_empty = 0; | 403 | all_empty = 0; |
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c index baf28611b334..291f2ed7cc31 100644 --- a/net/ipv4/tcp_cong.c +++ b/net/ipv4/tcp_cong.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Plugable TCP congestion control support and newReno | 2 | * Plugable TCP congestion control support and newReno |
3 | * congestion control. | 3 | * congestion control. |
4 | * Based on ideas from I/O scheduler suport and Web100. | 4 | * Based on ideas from I/O scheduler support and Web100. |
5 | * | 5 | * |
6 | * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org> | 6 | * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org> |
7 | */ | 7 | */ |
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index c6560cc7a9d6..698dc7e6f309 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h | |||
@@ -634,7 +634,7 @@ static inline void drv_reset_tsf(struct ieee80211_local *local, | |||
634 | 634 | ||
635 | static inline int drv_tx_last_beacon(struct ieee80211_local *local) | 635 | static inline int drv_tx_last_beacon(struct ieee80211_local *local) |
636 | { | 636 | { |
637 | int ret = 0; /* default unsuported op for less congestion */ | 637 | int ret = 0; /* default unsupported op for less congestion */ |
638 | 638 | ||
639 | might_sleep(); | 639 | might_sleep(); |
640 | 640 | ||
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 703fb26aa48d..9e312695c818 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c | |||
@@ -32,7 +32,7 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger) | |||
32 | return NULL; | 32 | return NULL; |
33 | } | 33 | } |
34 | 34 | ||
35 | /* return EEXIST if the same logger is registred, 0 on success. */ | 35 | /* return EEXIST if the same logger is registered, 0 on success. */ |
36 | int nf_log_register(u_int8_t pf, struct nf_logger *logger) | 36 | int nf_log_register(u_int8_t pf, struct nf_logger *logger) |
37 | { | 37 | { |
38 | const struct nf_logger *llog; | 38 | const struct nf_logger *llog; |
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index a5c952741279..9b9be5279f5d 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
@@ -676,7 +676,7 @@ static ssize_t rfkill_soft_store(struct device *dev, | |||
676 | rfkill_set_block(rfkill, state); | 676 | rfkill_set_block(rfkill, state); |
677 | mutex_unlock(&rfkill_global_mutex); | 677 | mutex_unlock(&rfkill_global_mutex); |
678 | 678 | ||
679 | return err ?: count; | 679 | return count; |
680 | } | 680 | } |
681 | 681 | ||
682 | static u8 user_state_from_blocked(unsigned long state) | 682 | static u8 user_state_from_blocked(unsigned long state) |
@@ -721,7 +721,7 @@ static ssize_t rfkill_state_store(struct device *dev, | |||
721 | rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); | 721 | rfkill_set_block(rfkill, state == RFKILL_USER_STATE_SOFT_BLOCKED); |
722 | mutex_unlock(&rfkill_global_mutex); | 722 | mutex_unlock(&rfkill_global_mutex); |
723 | 723 | ||
724 | return err ?: count; | 724 | return count; |
725 | } | 725 | } |
726 | 726 | ||
727 | static ssize_t rfkill_claim_show(struct device *dev, | 727 | static ssize_t rfkill_claim_show(struct device *dev, |
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 32ab55b18281..17a001bac2cc 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c | |||
@@ -163,7 +163,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, | |||
163 | 163 | ||
164 | list_add(&null_key->key_list, &ep->endpoint_shared_keys); | 164 | list_add(&null_key->key_list, &ep->endpoint_shared_keys); |
165 | 165 | ||
166 | /* Allocate and initialize transorms arrays for suported HMACs. */ | 166 | /* Allocate and initialize transorms arrays for supported HMACs. */ |
167 | err = sctp_auth_init_hmacs(ep, gfp); | 167 | err = sctp_auth_init_hmacs(ep, gfp); |
168 | if (err) | 168 | if (err) |
169 | goto nomem_hmacs; | 169 | goto nomem_hmacs; |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index ebcd1eedb115..618ec7e216ca 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -4000,7 +4000,7 @@ static sctp_ierror_t sctp_sf_authenticate(struct net *net, | |||
4000 | chunk->subh.auth_hdr = auth_hdr; | 4000 | chunk->subh.auth_hdr = auth_hdr; |
4001 | skb_pull(chunk->skb, sizeof(struct sctp_authhdr)); | 4001 | skb_pull(chunk->skb, sizeof(struct sctp_authhdr)); |
4002 | 4002 | ||
4003 | /* Make sure that we suport the HMAC algorithm from the auth | 4003 | /* Make sure that we support the HMAC algorithm from the auth |
4004 | * chunk. | 4004 | * chunk. |
4005 | */ | 4005 | */ |
4006 | if (!sctp_auth_asoc_verify_hmac_id(asoc, auth_hdr->hmac_id)) | 4006 | if (!sctp_auth_asoc_verify_hmac_id(asoc, auth_hdr->hmac_id)) |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 46e7aff80d1a..28b761567815 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
@@ -137,6 +137,8 @@ use strict; | |||
137 | # should document the "Context:" of the function, e.g. whether the functions | 137 | # should document the "Context:" of the function, e.g. whether the functions |
138 | # can be called form interrupts. Unlike other sections you can end it with an | 138 | # can be called form interrupts. Unlike other sections you can end it with an |
139 | # empty line. | 139 | # empty line. |
140 | # A non-void function should have a "Return:" section describing the return | ||
141 | # value(s). | ||
140 | # Example-sections should contain the string EXAMPLE so that they are marked | 142 | # Example-sections should contain the string EXAMPLE so that they are marked |
141 | # appropriately in DocBook. | 143 | # appropriately in DocBook. |
142 | # | 144 | # |
@@ -315,6 +317,7 @@ my $section_default = "Description"; # default section | |||
315 | my $section_intro = "Introduction"; | 317 | my $section_intro = "Introduction"; |
316 | my $section = $section_default; | 318 | my $section = $section_default; |
317 | my $section_context = "Context"; | 319 | my $section_context = "Context"; |
320 | my $section_return = "Return"; | ||
318 | 321 | ||
319 | my $undescribed = "-- undescribed --"; | 322 | my $undescribed = "-- undescribed --"; |
320 | 323 | ||
@@ -2039,6 +2042,28 @@ sub check_sections($$$$$$) { | |||
2039 | } | 2042 | } |
2040 | 2043 | ||
2041 | ## | 2044 | ## |
2045 | # Checks the section describing the return value of a function. | ||
2046 | sub check_return_section { | ||
2047 | my $file = shift; | ||
2048 | my $declaration_name = shift; | ||
2049 | my $return_type = shift; | ||
2050 | |||
2051 | # Ignore an empty return type (It's a macro) | ||
2052 | # Ignore functions with a "void" return type. (But don't ignore "void *") | ||
2053 | if (($return_type eq "") || ($return_type =~ /void\s*\w*\s*$/)) { | ||
2054 | return; | ||
2055 | } | ||
2056 | |||
2057 | if (!defined($sections{$section_return}) || | ||
2058 | $sections{$section_return} eq "") { | ||
2059 | print STDERR "Warning(${file}:$.): " . | ||
2060 | "No description found for return value of " . | ||
2061 | "'$declaration_name'\n"; | ||
2062 | ++$warnings; | ||
2063 | } | ||
2064 | } | ||
2065 | |||
2066 | ## | ||
2042 | # takes a function prototype and the name of the current file being | 2067 | # takes a function prototype and the name of the current file being |
2043 | # processed and spits out all the details stored in the global | 2068 | # processed and spits out all the details stored in the global |
2044 | # arrays/hashes. | 2069 | # arrays/hashes. |
@@ -2109,6 +2134,15 @@ sub dump_function($$) { | |||
2109 | my $prms = join " ", @parameterlist; | 2134 | my $prms = join " ", @parameterlist; |
2110 | check_sections($file, $declaration_name, "function", $sectcheck, $prms, ""); | 2135 | check_sections($file, $declaration_name, "function", $sectcheck, $prms, ""); |
2111 | 2136 | ||
2137 | # This check emits a lot of warnings at the moment, because many | ||
2138 | # functions don't have a 'Return' doc section. So until the number | ||
2139 | # of warnings goes sufficiently down, the check is only performed in | ||
2140 | # verbose mode. | ||
2141 | # TODO: always perform the check. | ||
2142 | if ($verbose) { | ||
2143 | check_return_section($file, $declaration_name, $return_type); | ||
2144 | } | ||
2145 | |||
2112 | output_declaration($declaration_name, | 2146 | output_declaration($declaration_name, |
2113 | 'function', | 2147 | 'function', |
2114 | {'function' => $declaration_name, | 2148 | {'function' => $declaration_name, |
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index a58f712605d8..86468f385fc8 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
@@ -358,8 +358,6 @@ key_ref_t search_my_process_keyrings(struct key_type *type, | |||
358 | 358 | ||
359 | switch (PTR_ERR(key_ref)) { | 359 | switch (PTR_ERR(key_ref)) { |
360 | case -EAGAIN: /* no key */ | 360 | case -EAGAIN: /* no key */ |
361 | if (ret) | ||
362 | break; | ||
363 | case -ENOKEY: /* negative key */ | 361 | case -ENOKEY: /* negative key */ |
364 | ret = key_ref; | 362 | ret = key_ref; |
365 | break; | 363 | break; |
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c index 60e8fc1b3440..040c60e1da28 100644 --- a/sound/core/seq/seq_device.c +++ b/sound/core/seq/seq_device.c | |||
@@ -66,7 +66,7 @@ struct ops_list { | |||
66 | /* operators */ | 66 | /* operators */ |
67 | struct snd_seq_dev_ops ops; | 67 | struct snd_seq_dev_ops ops; |
68 | 68 | ||
69 | /* registred devices */ | 69 | /* registered devices */ |
70 | struct list_head dev_list; /* list of devices */ | 70 | struct list_head dev_list; /* list of devices */ |
71 | int num_devices; /* number of associated devices */ | 71 | int num_devices; /* number of associated devices */ |
72 | int num_init_devices; /* number of initialized devices */ | 72 | int num_init_devices; /* number of initialized devices */ |
diff --git a/sound/pci/emu10k1/emu10k1_patch.c b/sound/pci/emu10k1/emu10k1_patch.c index e10f027bde03..662a45876a8b 100644 --- a/sound/pci/emu10k1/emu10k1_patch.c +++ b/sound/pci/emu10k1/emu10k1_patch.c | |||
@@ -123,7 +123,7 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp, | |||
123 | offset += size; | 123 | offset += size; |
124 | data += size; | 124 | data += size; |
125 | 125 | ||
126 | #if 0 /* not suppported yet */ | 126 | #if 0 /* not supported yet */ |
127 | /* handle reverse (or bidirectional) loop */ | 127 | /* handle reverse (or bidirectional) loop */ |
128 | if (sp->v.mode_flags & (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP)) { | 128 | if (sp->v.mode_flags & (SNDRV_SFNT_SAMPLE_BIDIR_LOOP|SNDRV_SFNT_SAMPLE_REVERSE_LOOP)) { |
129 | /* copy loop in reverse */ | 129 | /* copy loop in reverse */ |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 879db2d7796a..a1f32b5ae0d1 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2291,7 +2291,7 @@ static void snd_es1968_chip_init(struct es1968 *chip) | |||
2291 | outb(0x88, iobase+0x1f); | 2291 | outb(0x88, iobase+0x1f); |
2292 | 2292 | ||
2293 | /* it appears some maestros (dell 7500) only work if these are set, | 2293 | /* it appears some maestros (dell 7500) only work if these are set, |
2294 | regardless of wether we use the assp or not. */ | 2294 | regardless of whether we use the assp or not. */ |
2295 | 2295 | ||
2296 | outb(0, iobase + ASSP_CONTROL_B); | 2296 | outb(0, iobase + ASSP_CONTROL_B); |
2297 | outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ | 2297 | outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ |
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index ab2bca164d6f..9e28cc12969b 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c | |||
@@ -616,7 +616,7 @@ static int snd_ice1712_delta_init(struct snd_ice1712 *ice) | |||
616 | ice->num_total_dacs = 4; /* two AK4324 codecs */ | 616 | ice->num_total_dacs = 4; /* two AK4324 codecs */ |
617 | break; | 617 | break; |
618 | case ICE1712_SUBDEVICE_VX442: | 618 | case ICE1712_SUBDEVICE_VX442: |
619 | case ICE1712_SUBDEVICE_DELTA66E: /* omni not suported yet */ | 619 | case ICE1712_SUBDEVICE_DELTA66E: /* omni not supported yet */ |
620 | ice->num_total_dacs = 4; | 620 | ice->num_total_dacs = 4; |
621 | ice->num_total_adcs = 4; | 621 | ice->num_total_adcs = 4; |
622 | break; | 622 | break; |
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 550b9cfb8e3e..d59abe1682c5 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
@@ -1171,7 +1171,7 @@ static int sis_chip_init(struct sis7019 *sis) | |||
1171 | outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); | 1171 | outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); |
1172 | 1172 | ||
1173 | /* Reset the synchronization groups for all of the channels | 1173 | /* Reset the synchronization groups for all of the channels |
1174 | * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. | 1174 | * to be asynchronous. If we start doing SPDIF or 5.1 sound, etc. |
1175 | * we'll need to change how we handle these. Until then, we just | 1175 | * we'll need to change how we handle these. Until then, we just |
1176 | * assign sub-mixer 0 to all playback channels, and avoid any | 1176 | * assign sub-mixer 0 to all playback channels, and avoid any |
1177 | * attenuation on the audio. | 1177 | * attenuation on the audio. |
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0f58b4b6d702..007fcecdf5cd 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
@@ -675,7 +675,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, | |||
675 | */ | 675 | */ |
676 | int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp) | 676 | int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp) |
677 | { | 677 | { |
678 | /* it depends on altsetting wether the device is big-endian or not */ | 678 | /* it depends on altsetting whether the device is big-endian or not */ |
679 | switch (chip->usb_id) { | 679 | switch (chip->usb_id) { |
680 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */ | 680 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */ |
681 | if (fp->altsetting == 2 || fp->altsetting == 3 || | 681 | if (fp->altsetting == 2 || fp->altsetting == 3 || |
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index b38a1f9ad460..938e8904f64d 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt | |||
@@ -175,7 +175,7 @@ following filters are defined: | |||
175 | 175 | ||
176 | + | 176 | + |
177 | The option requires at least one branch type among any, any_call, any_ret, ind_call. | 177 | The option requires at least one branch type among any, any_call, any_ret, ind_call. |
178 | The privilege levels may be ommitted, in which case, the privilege levels of the associated | 178 | The privilege levels may be omitted, in which case, the privilege levels of the associated |
179 | event are applied to the branch filter. Both kernel (k) and hypervisor (hv) privilege | 179 | event are applied to the branch filter. Both kernel (k) and hypervisor (hv) privilege |
180 | levels are subject to permissions. When sampling on multiple events, branch stack sampling | 180 | levels are subject to permissions. When sampling on multiple events, branch stack sampling |
181 | is enabled for all the sampling events. The sampled branch type is the same for all events. | 181 | is enabled for all the sampling events. The sampled branch type is the same for all events. |
diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index aca6edcbbc6f..af8c925e93eb 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c | |||
@@ -405,7 +405,6 @@ static char *cpio_replace_env(char *new_location) | |||
405 | return new_location; | 405 | return new_location; |
406 | } | 406 | } |
407 | 407 | ||
408 | |||
409 | static int cpio_mkfile_line(const char *line) | 408 | static int cpio_mkfile_line(const char *line) |
410 | { | 409 | { |
411 | char name[PATH_MAX + 1]; | 410 | char name[PATH_MAX + 1]; |