diff options
40 files changed, 50 insertions, 349 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index a4dcf42c2fd9..944cf109a6f5 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -418,7 +418,7 @@ VmallocChunk: 111088 kB | |||
418 | Dirty: Memory which is waiting to get written back to the disk | 418 | Dirty: Memory which is waiting to get written back to the disk |
419 | Writeback: Memory which is actively being written back to the disk | 419 | Writeback: Memory which is actively being written back to the disk |
420 | Mapped: files which have been mmaped, such as libraries | 420 | Mapped: files which have been mmaped, such as libraries |
421 | Slab: in-kernel data structures cache | 421 | Slab: in-kernel data structures cache |
422 | CommitLimit: Based on the overcommit ratio ('vm.overcommit_ratio'), | 422 | CommitLimit: Based on the overcommit ratio ('vm.overcommit_ratio'), |
423 | this is the total amount of memory currently available to | 423 | this is the total amount of memory currently available to |
424 | be allocated on the system. This limit is only adhered to | 424 | be allocated on the system. This limit is only adhered to |
diff --git a/Documentation/i2o/ioctl b/Documentation/i2o/ioctl index 3e174978997d..1e77fac4e120 100644 --- a/Documentation/i2o/ioctl +++ b/Documentation/i2o/ioctl | |||
@@ -185,7 +185,7 @@ VII. Getting Parameters | |||
185 | ENOMEM Kernel memory allocation error | 185 | ENOMEM Kernel memory allocation error |
186 | 186 | ||
187 | A return value of 0 does not mean that the value was actually | 187 | A return value of 0 does not mean that the value was actually |
188 | properly retreived. The user should check the result list | 188 | properly retrieved. The user should check the result list |
189 | to determine the specific status of the transaction. | 189 | to determine the specific status of the transaction. |
190 | 190 | ||
191 | VIII. Downloading Software | 191 | VIII. Downloading Software |
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 851fc97bb22f..f9d979ee9526 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt | |||
@@ -245,7 +245,7 @@ Default: Both | |||
245 | This parameters is only relevant if auto-negotiation for this port is | 245 | This parameters is only relevant if auto-negotiation for this port is |
246 | not set to "Sense". If auto-negotiation is set to "On", all three values | 246 | not set to "Sense". If auto-negotiation is set to "On", all three values |
247 | are possible. If it is set to "Off", only "Full" and "Half" are allowed. | 247 | are possible. If it is set to "Off", only "Full" and "Half" are allowed. |
248 | This parameter is usefull if your link partner does not support all | 248 | This parameter is useful if your link partner does not support all |
249 | possible combinations. | 249 | possible combinations. |
250 | 250 | ||
251 | Flow Control | 251 | Flow Control |
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index cd0fcd89a6f0..08c79d4dc540 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
@@ -212,7 +212,7 @@ A: Try running | |||
212 | 212 | ||
213 | cat `cat /proc/[0-9]*/maps | grep / | sed 's:.* /:/:' | sort -u` > /dev/null | 213 | cat `cat /proc/[0-9]*/maps | grep / | sed 's:.* /:/:' | sort -u` > /dev/null |
214 | 214 | ||
215 | after resume. swapoff -a; swapon -a may also be usefull. | 215 | after resume. swapoff -a; swapon -a may also be useful. |
216 | 216 | ||
217 | Q: What happens to devices during swsusp? They seem to be resumed | 217 | Q: What happens to devices during swsusp? They seem to be resumed |
218 | during system suspend? | 218 | during system suspend? |
@@ -323,7 +323,7 @@ to be useless to try to suspend to disk while that app is running? | |||
323 | A: No, it should work okay, as long as your app does not mlock() | 323 | A: No, it should work okay, as long as your app does not mlock() |
324 | it. Just prepare big enough swap partition. | 324 | it. Just prepare big enough swap partition. |
325 | 325 | ||
326 | Q: What information is usefull for debugging suspend-to-disk problems? | 326 | Q: What information is useful for debugging suspend-to-disk problems? |
327 | 327 | ||
328 | A: Well, last messages on the screen are always useful. If something | 328 | A: Well, last messages on the screen are always useful. If something |
329 | is broken, it is usually some kernel driver, therefore trying with as | 329 | is broken, it is usually some kernel driver, therefore trying with as |
diff --git a/MAINTAINERS b/MAINTAINERS index 270e28c0506a..9b788d779472 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -546,13 +546,6 @@ W: http://linuxtv.org | |||
546 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git | 546 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
547 | S: Maintained | 547 | S: Maintained |
548 | 548 | ||
549 | BUSLOGIC SCSI DRIVER | ||
550 | P: Leonard N. Zubkoff | ||
551 | M: Leonard N. Zubkoff <lnz@dandelion.com> | ||
552 | L: linux-scsi@vger.kernel.org | ||
553 | W: http://www.dandelion.com/Linux/ | ||
554 | S: Maintained | ||
555 | |||
556 | COMMON INTERNET FILE SYSTEM (CIFS) | 549 | COMMON INTERNET FILE SYSTEM (CIFS) |
557 | P: Steve French | 550 | P: Steve French |
558 | M: sfrench@samba.org | 551 | M: sfrench@samba.org |
@@ -251,7 +251,7 @@ export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD | |||
251 | # If it is set to "silent_", nothing wil be printed at all, since | 251 | # If it is set to "silent_", nothing wil be printed at all, since |
252 | # the variable $(silent_cmd_cc_o_c) doesn't exist. | 252 | # the variable $(silent_cmd_cc_o_c) doesn't exist. |
253 | # | 253 | # |
254 | # A simple variant is to prefix commands with $(Q) - that's usefull | 254 | # A simple variant is to prefix commands with $(Q) - that's useful |
255 | # for commands that shall be hidden in non-verbose mode. | 255 | # for commands that shall be hidden in non-verbose mode. |
256 | # | 256 | # |
257 | # $(Q)ln $@ :< | 257 | # $(Q)ln $@ :< |
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index bd900b7ab33c..92ff5dc07351 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -184,7 +184,7 @@ static void __init omap_perseus2_map_io(void) | |||
184 | omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); | 184 | omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); |
185 | 185 | ||
186 | /* | 186 | /* |
187 | * Ethernet support trough the debug board | 187 | * Ethernet support through the debug board |
188 | * CS1 timings setup | 188 | * CS1 timings setup |
189 | */ | 189 | */ |
190 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); | 190 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); |
diff --git a/arch/i386/kernel/cpu/changelog b/arch/i386/kernel/cpu/changelog deleted file mode 100644 index cef76b80a710..000000000000 --- a/arch/i386/kernel/cpu/changelog +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | /* | ||
2 | * Enhanced CPU type detection by Mike Jagdis, Patrick St. Jean | ||
3 | * and Martin Mares, November 1997. | ||
4 | * | ||
5 | * Force Cyrix 6x86(MX) and M II processors to report MTRR capability | ||
6 | * and Cyrix "coma bug" recognition by | ||
7 | * Zoltán Böszörményi <zboszor@mail.externet.hu> February 1999. | ||
8 | * | ||
9 | * Force Centaur C6 processors to report MTRR capability. | ||
10 | * Bart Hartgers <bart@etpmod.phys.tue.nl>, May 1999. | ||
11 | * | ||
12 | * Intel Mobile Pentium II detection fix. Sean Gilley, June 1999. | ||
13 | * | ||
14 | * IDT Winchip tweaks, misc clean ups. | ||
15 | * Dave Jones <davej@suse.de>, August 1999 | ||
16 | * | ||
17 | * Better detection of Centaur/IDT WinChip models. | ||
18 | * Bart Hartgers <bart@etpmod.phys.tue.nl>, August 1999. | ||
19 | * | ||
20 | * Cleaned up cache-detection code | ||
21 | * Dave Jones <davej@suse.de>, October 1999 | ||
22 | * | ||
23 | * Added proper L2 cache detection for Coppermine | ||
24 | * Dragan Stancevic <visitor@valinux.com>, October 1999 | ||
25 | * | ||
26 | * Added the original array for capability flags but forgot to credit | ||
27 | * myself :) (~1998) Fixed/cleaned up some cpu_model_info and other stuff | ||
28 | * Jauder Ho <jauderho@carumba.com>, January 2000 | ||
29 | * | ||
30 | * Detection for Celeron coppermine, identify_cpu() overhauled, | ||
31 | * and a few other clean ups. | ||
32 | * Dave Jones <davej@suse.de>, April 2000 | ||
33 | * | ||
34 | * Pentium III FXSR, SSE support | ||
35 | * General FPU state handling cleanups | ||
36 | * Gareth Hughes <gareth@valinux.com>, May 2000 | ||
37 | * | ||
38 | * Added proper Cascades CPU and L2 cache detection for Cascades | ||
39 | * and 8-way type cache happy bunch from Intel:^) | ||
40 | * Dragan Stancevic <visitor@valinux.com>, May 2000 | ||
41 | * | ||
42 | * Forward port AMD Duron errata T13 from 2.2.17pre | ||
43 | * Dave Jones <davej@suse.de>, August 2000 | ||
44 | * | ||
45 | * Forward port lots of fixes/improvements from 2.2.18pre | ||
46 | * Cyrix III, Pentium IV support. | ||
47 | * Dave Jones <davej@suse.de>, October 2000 | ||
48 | * | ||
49 | * Massive cleanup of CPU detection and bug handling; | ||
50 | * Transmeta CPU detection, | ||
51 | * H. Peter Anvin <hpa@zytor.com>, November 2000 | ||
52 | * | ||
53 | * VIA C3 Support. | ||
54 | * Dave Jones <davej@suse.de>, March 2001 | ||
55 | * | ||
56 | * AMD Athlon/Duron/Thunderbird bluesmoke support. | ||
57 | * Dave Jones <davej@suse.de>, April 2001. | ||
58 | * | ||
59 | * CacheSize bug workaround updates for AMD, Intel & VIA Cyrix. | ||
60 | * Dave Jones <davej@suse.de>, September, October 2001. | ||
61 | * | ||
62 | */ | ||
63 | |||
diff --git a/arch/i386/kernel/cpu/mtrr/changelog b/arch/i386/kernel/cpu/mtrr/changelog deleted file mode 100644 index af1368535955..000000000000 --- a/arch/i386/kernel/cpu/mtrr/changelog +++ /dev/null | |||
@@ -1,229 +0,0 @@ | |||
1 | ChangeLog | ||
2 | |||
3 | Prehistory Martin Tischhäuser <martin@ikcbarka.fzk.de> | ||
4 | Initial register-setting code (from proform-1.0). | ||
5 | 19971216 Richard Gooch <rgooch@atnf.csiro.au> | ||
6 | Original version for /proc/mtrr interface, SMP-safe. | ||
7 | v1.0 | ||
8 | 19971217 Richard Gooch <rgooch@atnf.csiro.au> | ||
9 | Bug fix for ioctls()'s. | ||
10 | Added sample code in Documentation/mtrr.txt | ||
11 | v1.1 | ||
12 | 19971218 Richard Gooch <rgooch@atnf.csiro.au> | ||
13 | Disallow overlapping regions. | ||
14 | 19971219 Jens Maurer <jmaurer@menuett.rhein-main.de> | ||
15 | Register-setting fixups. | ||
16 | v1.2 | ||
17 | 19971222 Richard Gooch <rgooch@atnf.csiro.au> | ||
18 | Fixups for kernel 2.1.75. | ||
19 | v1.3 | ||
20 | 19971229 David Wragg <dpw@doc.ic.ac.uk> | ||
21 | Register-setting fixups and conformity with Intel conventions. | ||
22 | 19971229 Richard Gooch <rgooch@atnf.csiro.au> | ||
23 | Cosmetic changes and wrote this ChangeLog ;-) | ||
24 | 19980106 Richard Gooch <rgooch@atnf.csiro.au> | ||
25 | Fixups for kernel 2.1.78. | ||
26 | v1.4 | ||
27 | 19980119 David Wragg <dpw@doc.ic.ac.uk> | ||
28 | Included passive-release enable code (elsewhere in PCI setup). | ||
29 | v1.5 | ||
30 | 19980131 Richard Gooch <rgooch@atnf.csiro.au> | ||
31 | Replaced global kernel lock with private spinlock. | ||
32 | v1.6 | ||
33 | 19980201 Richard Gooch <rgooch@atnf.csiro.au> | ||
34 | Added wait for other CPUs to complete changes. | ||
35 | v1.7 | ||
36 | 19980202 Richard Gooch <rgooch@atnf.csiro.au> | ||
37 | Bug fix in definition of <set_mtrr> for UP. | ||
38 | v1.8 | ||
39 | 19980319 Richard Gooch <rgooch@atnf.csiro.au> | ||
40 | Fixups for kernel 2.1.90. | ||
41 | 19980323 Richard Gooch <rgooch@atnf.csiro.au> | ||
42 | Move SMP BIOS fixup before secondary CPUs call <calibrate_delay> | ||
43 | v1.9 | ||
44 | 19980325 Richard Gooch <rgooch@atnf.csiro.au> | ||
45 | Fixed test for overlapping regions: confused by adjacent regions | ||
46 | 19980326 Richard Gooch <rgooch@atnf.csiro.au> | ||
47 | Added wbinvd in <set_mtrr_prepare>. | ||
48 | 19980401 Richard Gooch <rgooch@atnf.csiro.au> | ||
49 | Bug fix for non-SMP compilation. | ||
50 | 19980418 David Wragg <dpw@doc.ic.ac.uk> | ||
51 | Fixed-MTRR synchronisation for SMP and use atomic operations | ||
52 | instead of spinlocks. | ||
53 | 19980418 Richard Gooch <rgooch@atnf.csiro.au> | ||
54 | Differentiate different MTRR register classes for BIOS fixup. | ||
55 | v1.10 | ||
56 | 19980419 David Wragg <dpw@doc.ic.ac.uk> | ||
57 | Bug fix in variable MTRR synchronisation. | ||
58 | v1.11 | ||
59 | 19980419 Richard Gooch <rgooch@atnf.csiro.au> | ||
60 | Fixups for kernel 2.1.97. | ||
61 | v1.12 | ||
62 | 19980421 Richard Gooch <rgooch@atnf.csiro.au> | ||
63 | Safer synchronisation across CPUs when changing MTRRs. | ||
64 | v1.13 | ||
65 | 19980423 Richard Gooch <rgooch@atnf.csiro.au> | ||
66 | Bugfix for SMP systems without MTRR support. | ||
67 | v1.14 | ||
68 | 19980427 Richard Gooch <rgooch@atnf.csiro.au> | ||
69 | Trap calls to <mtrr_add> and <mtrr_del> on non-MTRR machines. | ||
70 | v1.15 | ||
71 | 19980427 Richard Gooch <rgooch@atnf.csiro.au> | ||
72 | Use atomic bitops for setting SMP change mask. | ||
73 | v1.16 | ||
74 | 19980428 Richard Gooch <rgooch@atnf.csiro.au> | ||
75 | Removed spurious diagnostic message. | ||
76 | v1.17 | ||
77 | 19980429 Richard Gooch <rgooch@atnf.csiro.au> | ||
78 | Moved register-setting macros into this file. | ||
79 | Moved setup code from init/main.c to i386-specific areas. | ||
80 | v1.18 | ||
81 | 19980502 Richard Gooch <rgooch@atnf.csiro.au> | ||
82 | Moved MTRR detection outside conditionals in <mtrr_init>. | ||
83 | v1.19 | ||
84 | 19980502 Richard Gooch <rgooch@atnf.csiro.au> | ||
85 | Documentation improvement: mention Pentium II and AGP. | ||
86 | v1.20 | ||
87 | 19980521 Richard Gooch <rgooch@atnf.csiro.au> | ||
88 | Only manipulate interrupt enable flag on local CPU. | ||
89 | Allow enclosed uncachable regions. | ||
90 | v1.21 | ||
91 | 19980611 Richard Gooch <rgooch@atnf.csiro.au> | ||
92 | Always define <main_lock>. | ||
93 | v1.22 | ||
94 | 19980901 Richard Gooch <rgooch@atnf.csiro.au> | ||
95 | Removed module support in order to tidy up code. | ||
96 | Added sanity check for <mtrr_add>/<mtrr_del> before <mtrr_init>. | ||
97 | Created addition queue for prior to SMP commence. | ||
98 | v1.23 | ||
99 | 19980902 Richard Gooch <rgooch@atnf.csiro.au> | ||
100 | Ported patch to kernel 2.1.120-pre3. | ||
101 | v1.24 | ||
102 | 19980910 Richard Gooch <rgooch@atnf.csiro.au> | ||
103 | Removed sanity checks and addition queue: Linus prefers an OOPS. | ||
104 | v1.25 | ||
105 | 19981001 Richard Gooch <rgooch@atnf.csiro.au> | ||
106 | Fixed harmless compiler warning in include/asm-i386/mtrr.h | ||
107 | Fixed version numbering and history for v1.23 -> v1.24. | ||
108 | v1.26 | ||
109 | 19990118 Richard Gooch <rgooch@atnf.csiro.au> | ||
110 | Added devfs support. | ||
111 | v1.27 | ||
112 | 19990123 Richard Gooch <rgooch@atnf.csiro.au> | ||
113 | Changed locking to spin with reschedule. | ||
114 | Made use of new <smp_call_function>. | ||
115 | v1.28 | ||
116 | 19990201 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
117 | Extended the driver to be able to use Cyrix style ARRs. | ||
118 | 19990204 Richard Gooch <rgooch@atnf.csiro.au> | ||
119 | Restructured Cyrix support. | ||
120 | v1.29 | ||
121 | 19990204 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
122 | Refined ARR support: enable MAPEN in set_mtrr_prepare() | ||
123 | and disable MAPEN in set_mtrr_done(). | ||
124 | 19990205 Richard Gooch <rgooch@atnf.csiro.au> | ||
125 | Minor cleanups. | ||
126 | v1.30 | ||
127 | 19990208 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
128 | Protect plain 6x86s (and other processors without the | ||
129 | Page Global Enable feature) against accessing CR4 in | ||
130 | set_mtrr_prepare() and set_mtrr_done(). | ||
131 | 19990210 Richard Gooch <rgooch@atnf.csiro.au> | ||
132 | Turned <set_mtrr_up> and <get_mtrr> into function pointers. | ||
133 | v1.31 | ||
134 | 19990212 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
135 | Major rewrite of cyrix_arr_init(): do not touch ARRs, | ||
136 | leave them as the BIOS have set them up. | ||
137 | Enable usage of all 8 ARRs. | ||
138 | Avoid multiplications by 3 everywhere and other | ||
139 | code clean ups/speed ups. | ||
140 | 19990213 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
141 | Set up other Cyrix processors identical to the boot cpu. | ||
142 | Since Cyrix don't support Intel APIC, this is l'art pour l'art. | ||
143 | Weigh ARRs by size: | ||
144 | If size <= 32M is given, set up ARR# we were given. | ||
145 | If size > 32M is given, set up ARR7 only if it is free, | ||
146 | fail otherwise. | ||
147 | 19990214 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
148 | Also check for size >= 256K if we are to set up ARR7, | ||
149 | mtrr_add() returns the value it gets from set_mtrr() | ||
150 | 19990218 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
151 | Remove Cyrix "coma bug" workaround from here. | ||
152 | Moved to linux/arch/i386/kernel/setup.c and | ||
153 | linux/include/asm-i386/bugs.h | ||
154 | 19990228 Richard Gooch <rgooch@atnf.csiro.au> | ||
155 | Added MTRRIOC_KILL_ENTRY ioctl(2) | ||
156 | Trap for counter underflow in <mtrr_file_del>. | ||
157 | Trap for 4 MiB aligned regions for PPro, stepping <= 7. | ||
158 | 19990301 Richard Gooch <rgooch@atnf.csiro.au> | ||
159 | Created <get_free_region> hook. | ||
160 | 19990305 Richard Gooch <rgooch@atnf.csiro.au> | ||
161 | Temporarily disable AMD support now MTRR capability flag is set. | ||
162 | v1.32 | ||
163 | 19990308 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
164 | Adjust my changes (19990212-19990218) to Richard Gooch's | ||
165 | latest changes. (19990228-19990305) | ||
166 | v1.33 | ||
167 | 19990309 Richard Gooch <rgooch@atnf.csiro.au> | ||
168 | Fixed typo in <printk> message. | ||
169 | 19990310 Richard Gooch <rgooch@atnf.csiro.au> | ||
170 | Support K6-II/III based on Alan Cox's <alan@redhat.com> patches. | ||
171 | v1.34 | ||
172 | 19990511 Bart Hartgers <bart@etpmod.phys.tue.nl> | ||
173 | Support Centaur C6 MCR's. | ||
174 | 19990512 Richard Gooch <rgooch@atnf.csiro.au> | ||
175 | Minor cleanups. | ||
176 | v1.35 | ||
177 | 19990707 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
178 | Check whether ARR3 is protected in cyrix_get_free_region() | ||
179 | and mtrr_del(). The code won't attempt to delete or change it | ||
180 | from now on if the BIOS protected ARR3. It silently skips ARR3 | ||
181 | in cyrix_get_free_region() or returns with an error code from | ||
182 | mtrr_del(). | ||
183 | 19990711 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
184 | Reset some bits in the CCRs in cyrix_arr_init() to disable SMM | ||
185 | if ARR3 isn't protected. This is needed because if SMM is active | ||
186 | and ARR3 isn't protected then deleting and setting ARR3 again | ||
187 | may lock up the processor. With SMM entirely disabled, it does | ||
188 | not happen. | ||
189 | 19990812 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
190 | Rearrange switch() statements so the driver accomodates to | ||
191 | the fact that the AMD Athlon handles its MTRRs the same way | ||
192 | as Intel does. | ||
193 | 19990814 Zoltán Böszörményi <zboszor@mail.externet.hu> | ||
194 | Double check for Intel in mtrr_add()'s big switch() because | ||
195 | that revision check is only valid for Intel CPUs. | ||
196 | 19990819 Alan Cox <alan@redhat.com> | ||
197 | Tested Zoltan's changes on a pre production Athlon - 100% | ||
198 | success. | ||
199 | 19991008 Manfred Spraul <manfreds@colorfullife.com> | ||
200 | replaced spin_lock_reschedule() with a normal semaphore. | ||
201 | v1.36 | ||
202 | 20000221 Richard Gooch <rgooch@atnf.csiro.au> | ||
203 | Compile fix if procfs and devfs not enabled. | ||
204 | Formatting changes. | ||
205 | v1.37 | ||
206 | 20001109 H. Peter Anvin <hpa@zytor.com> | ||
207 | Use the new centralized CPU feature detects. | ||
208 | |||
209 | v1.38 | ||
210 | 20010309 Dave Jones <davej@suse.de> | ||
211 | Add support for Cyrix III. | ||
212 | |||
213 | v1.39 | ||
214 | 20010312 Dave Jones <davej@suse.de> | ||
215 | Ugh, I broke AMD support. | ||
216 | Reworked fix by Troels Walsted Hansen <troels@thule.no> | ||
217 | |||
218 | v1.40 | ||
219 | 20010327 Dave Jones <davej@suse.de> | ||
220 | Adapted Cyrix III support to include VIA C3. | ||
221 | |||
222 | v2.0 | ||
223 | 20020306 Patrick Mochel <mochel@osdl.org> | ||
224 | Split mtrr.c -> mtrr/*.c | ||
225 | Converted to Linux Kernel Coding Style | ||
226 | Fixed several minor nits in form | ||
227 | Moved some SMP-only functions out, so they can be used | ||
228 | for power management in the future. | ||
229 | TODO: Fix user interface cruft. | ||
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 977ee3adaf2d..34ab0daec3a7 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -972,7 +972,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
972 | #endif | 972 | #endif |
973 | 973 | ||
974 | #ifdef CONFIG_PPC_RTAS | 974 | #ifdef CONFIG_PPC_RTAS |
975 | /* To help early debugging via the front panel, we retreive a minimal | 975 | /* To help early debugging via the front panel, we retrieve a minimal |
976 | * set of RTAS infos now if available | 976 | * set of RTAS infos now if available |
977 | */ | 977 | */ |
978 | { | 978 | { |
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 4283fa33f784..ae2e2a31a705 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -632,7 +632,7 @@ void rtas_stop_self(void) | |||
632 | } | 632 | } |
633 | 633 | ||
634 | /* | 634 | /* |
635 | * Call early during boot, before mem init or bootmem, to retreive the RTAS | 635 | * Call early during boot, before mem init or bootmem, to retrieve the RTAS |
636 | * informations from the device-tree and allocate the RMO buffer for userland | 636 | * informations from the device-tree and allocate the RMO buffer for userland |
637 | * accesses. | 637 | * accesses. |
638 | */ | 638 | */ |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 98e9f0595dd8..81567e931260 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -438,7 +438,7 @@ void __init setup_system(void) | |||
438 | 438 | ||
439 | /* | 439 | /* |
440 | * Fill the ppc64_caches & systemcfg structures with informations | 440 | * Fill the ppc64_caches & systemcfg structures with informations |
441 | * retreived from the device-tree. Need to be called before | 441 | * retrieved from the device-tree. Need to be called before |
442 | * finish_device_tree() since the later requires some of the | 442 | * finish_device_tree() since the later requires some of the |
443 | * informations filled up here to properly parse the interrupt | 443 | * informations filled up here to properly parse the interrupt |
444 | * tree. | 444 | * tree. |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 5bb433cbe41b..149351a84b94 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
@@ -368,7 +368,7 @@ static unsigned long __init htab_get_table_size(void) | |||
368 | unsigned long mem_size, rnd_mem_size, pteg_count; | 368 | unsigned long mem_size, rnd_mem_size, pteg_count; |
369 | 369 | ||
370 | /* If hash size isn't already provided by the platform, we try to | 370 | /* If hash size isn't already provided by the platform, we try to |
371 | * retreive it from the device-tree. If it's not there neither, we | 371 | * retrieve it from the device-tree. If it's not there neither, we |
372 | * calculate it now based on the total RAM size | 372 | * calculate it now based on the total RAM size |
373 | */ | 373 | */ |
374 | if (ppc64_pft_size == 0) | 374 | if (ppc64_pft_size == 0) |
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c index a4b50c4109c2..a415e8d2f7af 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_64.c +++ b/arch/powerpc/platforms/powermac/cpufreq_64.c | |||
@@ -80,7 +80,7 @@ static struct freq_attr* g5_cpu_freqs_attr[] = { | |||
80 | }; | 80 | }; |
81 | 81 | ||
82 | /* Power mode data is an array of the 32 bits PCR values to use for | 82 | /* Power mode data is an array of the 32 bits PCR values to use for |
83 | * the various frequencies, retreived from the device-tree | 83 | * the various frequencies, retrieved from the device-tree |
84 | */ | 84 | */ |
85 | static u32 *g5_pmode_data; | 85 | static u32 *g5_pmode_data; |
86 | static int g5_pmode_max; | 86 | static int g5_pmode_max; |
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index cb6e38ed2b1d..937d81f62f43 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -201,7 +201,7 @@ again: | |||
201 | if ((signed long)(get_ccount() - next) > 0) | 201 | if ((signed long)(get_ccount() - next) > 0) |
202 | goto again; | 202 | goto again; |
203 | 203 | ||
204 | /* Allow platform to do something usefull (Wdog). */ | 204 | /* Allow platform to do something useful (Wdog). */ |
205 | 205 | ||
206 | platform_heartbeat(); | 206 | platform_heartbeat(); |
207 | 207 | ||
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index 01f035173328..ce127f7ec0f6 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c | |||
@@ -32,7 +32,7 @@ History: | |||
32 | 18 mrt 1995: 0.24 Working background read-ahead. (still problems) | 32 | 18 mrt 1995: 0.24 Working background read-ahead. (still problems) |
33 | 26 mrt 1995: 0.25 Multi-session ioctl added (kernel v1.2). | 33 | 26 mrt 1995: 0.25 Multi-session ioctl added (kernel v1.2). |
34 | Statistics implemented, though separate stats206.h. | 34 | Statistics implemented, though separate stats206.h. |
35 | Accessible trough ioctl 0x1000 (just a number). | 35 | Accessible through ioctl 0x1000 (just a number). |
36 | Hard to choose between v1.2 development and 1.1.75. | 36 | Hard to choose between v1.2 development and 1.1.75. |
37 | Bottom-half doesn't work with 1.2... | 37 | Bottom-half doesn't work with 1.2... |
38 | 0.25a: fixed... typo. Still problems... | 38 | 0.25a: fixed... typo. Still problems... |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 8d0958c38b6b..4f50ee5767a2 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -630,12 +630,12 @@ static int read_eeprom(int cpu, struct mpu_data *out) | |||
630 | sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0); | 630 | sprintf(nodename, "/u3@0,f8000000/i2c@f8001000/cpuid@a%d", cpu ? 2 : 0); |
631 | np = of_find_node_by_path(nodename); | 631 | np = of_find_node_by_path(nodename); |
632 | if (np == NULL) { | 632 | if (np == NULL) { |
633 | printk(KERN_ERR "therm_pm72: Failed to retreive cpuid node from device-tree\n"); | 633 | printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n"); |
634 | return -ENODEV; | 634 | return -ENODEV; |
635 | } | 635 | } |
636 | data = (u8 *)get_property(np, "cpuid", &len); | 636 | data = (u8 *)get_property(np, "cpuid", &len); |
637 | if (data == NULL) { | 637 | if (data == NULL) { |
638 | printk(KERN_ERR "therm_pm72: Failed to retreive cpuid property from device-tree\n"); | 638 | printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n"); |
639 | of_node_put(np); | 639 | of_node_put(np); |
640 | return -ENODEV; | 640 | return -ENODEV; |
641 | } | 641 | } |
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index 80ddf9776bde..eb69a601e765 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * (typically the drive fan) | 26 | * (typically the drive fan) |
27 | * - the main control (first control) gets the target value scaled with | 27 | * - the main control (first control) gets the target value scaled with |
28 | * the first pair of factors, and is then modified as below | 28 | * the first pair of factors, and is then modified as below |
29 | * - the value of the target of the CPU Fan control loop is retreived, | 29 | * - the value of the target of the CPU Fan control loop is retrieved, |
30 | * scaled with the second pair of factors, and the max of that and | 30 | * scaled with the second pair of factors, and the max of that and |
31 | * the scaled target is applied to the main control. | 31 | * the scaled target is applied to the main control. |
32 | * | 32 | * |
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c index 26632cead09a..099ffb3b9c71 100644 --- a/drivers/media/radio/radio-sf16fmr2.c +++ b/drivers/media/radio/radio-sf16fmr2.c | |||
@@ -48,7 +48,7 @@ static int io = 0x384; | |||
48 | static int radio_nr = -1; | 48 | static int radio_nr = -1; |
49 | 49 | ||
50 | /* hw precision is 12.5 kHz | 50 | /* hw precision is 12.5 kHz |
51 | * It is only usefull to give freq in intervall of 200 (=0.0125Mhz), | 51 | * It is only useful to give freq in intervall of 200 (=0.0125Mhz), |
52 | * other bits will be truncated | 52 | * other bits will be truncated |
53 | */ | 53 | */ |
54 | #define RSF16_ENCODE(x) ((x)/200+856) | 54 | #define RSF16_ENCODE(x) ((x)/200+856) |
diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl index 73dd084c0e98..65c0c47aeb79 100644 --- a/drivers/message/i2o/README.ioctl +++ b/drivers/message/i2o/README.ioctl | |||
@@ -185,7 +185,7 @@ VII. Getting Parameters | |||
185 | ENOMEM Kernel memory allocation error | 185 | ENOMEM Kernel memory allocation error |
186 | 186 | ||
187 | A return value of 0 does not mean that the value was actually | 187 | A return value of 0 does not mean that the value was actually |
188 | properly retreived. The user should check the result list | 188 | properly retrieved. The user should check the result list |
189 | to determine the specific status of the transaction. | 189 | to determine the specific status of the transaction. |
190 | 190 | ||
191 | VIII. Downloading Software | 191 | VIII. Downloading Software |
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index e92c17f6931c..55c7ed608391 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
@@ -276,7 +276,7 @@ static void hp100_RegisterDump(struct net_device *dev); | |||
276 | * Convert an address in a kernel buffer to a bus/phys/dma address. | 276 | * Convert an address in a kernel buffer to a bus/phys/dma address. |
277 | * This work *only* for memory fragments part of lp->page_vaddr, | 277 | * This work *only* for memory fragments part of lp->page_vaddr, |
278 | * because it was properly DMA allocated via pci_alloc_consistent(), | 278 | * because it was properly DMA allocated via pci_alloc_consistent(), |
279 | * so we just need to "retreive" the original mapping to bus/phys/dma | 279 | * so we just need to "retrieve" the original mapping to bus/phys/dma |
280 | * address - Jean II */ | 280 | * address - Jean II */ |
281 | static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr) | 281 | static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr) |
282 | { | 282 | { |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 049c34b37067..593d8adee891 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -1598,7 +1598,7 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1598 | switch(cmd) { | 1598 | switch(cmd) { |
1599 | case SIOCGMIIPHY: /* Get the address of the PHY in use. */ | 1599 | case SIOCGMIIPHY: /* Get the address of the PHY in use. */ |
1600 | data[0] = 0; /* we have only this address */ | 1600 | data[0] = 0; /* we have only this address */ |
1601 | /* fall trough */ | 1601 | /* fall through */ |
1602 | case SIOCGMIIREG: /* Read the specified MII register. */ | 1602 | case SIOCGMIIREG: /* Read the specified MII register. */ |
1603 | data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f); | 1603 | data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f); |
1604 | break; | 1604 | break; |
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c index 0fddf61047b4..07c1b4c8699d 100644 --- a/drivers/net/sk98lin/skdim.c +++ b/drivers/net/sk98lin/skdim.c | |||
@@ -180,7 +180,7 @@ SkDimModerate(SK_AC *pAC) { | |||
180 | /* | 180 | /* |
181 | ** The number of interrupts per sec is the same as expected. | 181 | ** The number of interrupts per sec is the same as expected. |
182 | ** Evalulate the descriptor-ratio. If it has changed, a resize | 182 | ** Evalulate the descriptor-ratio. If it has changed, a resize |
183 | ** in the moderation timer might be usefull | 183 | ** in the moderation timer might be useful |
184 | */ | 184 | */ |
185 | if (M_DIMINFO.AutoSizing) { | 185 | if (M_DIMINFO.AutoSizing) { |
186 | ResizeDimTimerDuration(pAC); | 186 | ResizeDimTimerDuration(pAC); |
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 197edd74fbb5..a5f2b1ee0752 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c | |||
@@ -2851,7 +2851,7 @@ unsigned long Flags; /* for spin lock */ | |||
2851 | * Description: | 2851 | * Description: |
2852 | * This function is called if an ioctl is issued on the device. | 2852 | * This function is called if an ioctl is issued on the device. |
2853 | * There are three subfunction for reading, writing and test-writing | 2853 | * There are three subfunction for reading, writing and test-writing |
2854 | * the private MIB data structure (usefull for SysKonnect-internal tools). | 2854 | * the private MIB data structure (useful for SysKonnect-internal tools). |
2855 | * | 2855 | * |
2856 | * Returns: | 2856 | * Returns: |
2857 | * 0, if everything is ok | 2857 | * 0, if everything is ok |
diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c index 58e1a5be913f..a386172107e8 100644 --- a/drivers/net/sk98lin/skgepnmi.c +++ b/drivers/net/sk98lin/skgepnmi.c | |||
@@ -611,7 +611,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */ | |||
611 | * Description: | 611 | * Description: |
612 | * Calls a general sub-function for all this stuff. The preset does | 612 | * Calls a general sub-function for all this stuff. The preset does |
613 | * the same as a set, but returns just before finally setting the | 613 | * the same as a set, but returns just before finally setting the |
614 | * new value. This is usefull to check if a set might be successfull. | 614 | * new value. This is useful to check if a set might be successfull. |
615 | * If the instance -1 is passed, an array of values is supposed and | 615 | * If the instance -1 is passed, an array of values is supposed and |
616 | * all instances of the OID will be set. | 616 | * all instances of the OID will be set. |
617 | * | 617 | * |
@@ -654,7 +654,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */ | |||
654 | * Description: | 654 | * Description: |
655 | * Calls a general sub-function for all this stuff. The preset does | 655 | * Calls a general sub-function for all this stuff. The preset does |
656 | * the same as a set, but returns just before finally setting the | 656 | * the same as a set, but returns just before finally setting the |
657 | * new value. This is usefull to check if a set might be successfull. | 657 | * new value. This is useful to check if a set might be successfull. |
658 | * If the instance -1 is passed, an array of values is supposed and | 658 | * If the instance -1 is passed, an array of values is supposed and |
659 | * all instances of the OID will be set. | 659 | * all instances of the OID will be set. |
660 | * | 660 | * |
@@ -870,7 +870,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */ | |||
870 | * Description: | 870 | * Description: |
871 | * Calls a general sub-function for all this set stuff. The preset does | 871 | * Calls a general sub-function for all this set stuff. The preset does |
872 | * the same as a set, but returns just before finally setting the | 872 | * the same as a set, but returns just before finally setting the |
873 | * new value. This is usefull to check if a set might be successfull. | 873 | * new value. This is useful to check if a set might be successfull. |
874 | * The sub-function runs through the IdTable, checks which OIDs are able | 874 | * The sub-function runs through the IdTable, checks which OIDs are able |
875 | * to set, and calls the handler function of the OID to perform the | 875 | * to set, and calls the handler function of the OID to perform the |
876 | * preset. The return value of the function will also be stored in | 876 | * preset. The return value of the function will also be stored in |
@@ -6473,7 +6473,7 @@ unsigned int PhysPortIndex) /* Physical port index */ | |||
6473 | * | 6473 | * |
6474 | * Description: | 6474 | * Description: |
6475 | * The COMMON module only tells us if the mode is half or full duplex. | 6475 | * The COMMON module only tells us if the mode is half or full duplex. |
6476 | * But in the decade of auto sensing it is usefull for the user to | 6476 | * But in the decade of auto sensing it is useful for the user to |
6477 | * know if the mode was negotiated or forced. Therefore we have a | 6477 | * know if the mode was negotiated or forced. Therefore we have a |
6478 | * look to the mode, which was last used by the negotiation process. | 6478 | * look to the mode, which was last used by the negotiation process. |
6479 | * | 6479 | * |
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 95bd07b8b61b..315be4770d3e 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c | |||
@@ -347,7 +347,7 @@ static void led_LCD_driver(unsigned char leds) | |||
347 | ** | 347 | ** |
348 | ** led_get_net_activity() | 348 | ** led_get_net_activity() |
349 | ** | 349 | ** |
350 | ** calculate if there was TX- or RX-troughput on the network interfaces | 350 | ** calculate if there was TX- or RX-throughput on the network interfaces |
351 | ** (analog to dev_get_info() from net/core/dev.c) | 351 | ** (analog to dev_get_info() from net/core/dev.c) |
352 | ** | 352 | ** |
353 | */ | 353 | */ |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index ed1899d307db..be3fd9bce573 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -11,14 +11,14 @@ config USB_EHCI_HCD | |||
11 | The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 | 11 | The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 |
12 | "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. | 12 | "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. |
13 | If your USB host controller supports USB 2.0, you will likely want to | 13 | If your USB host controller supports USB 2.0, you will likely want to |
14 | configure this Host Controller Driver. At this writing, the primary | 14 | configure this Host Controller Driver. At the time of this writing, |
15 | implementation of EHCI is a chip from NEC, widely available in add-on | 15 | the primary implementation of EHCI is a chip from NEC, widely available |
16 | PCI cards, but implementations are in the works from other vendors | 16 | in add-on PCI cards, but implementations are in the works from other |
17 | including Intel and Philips. Motherboard support is appearing. | 17 | vendors including Intel and Philips. Motherboard support is appearing. |
18 | 18 | ||
19 | EHCI controllers are packaged with "companion" host controllers (OHCI | 19 | EHCI controllers are packaged with "companion" host controllers (OHCI |
20 | or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports | 20 | or UHCI) to handle USB 1.1 devices connected to root hub ports. Ports |
21 | will connect to EHCI if it the device is high speed, otherwise they | 21 | will connect to EHCI if the device is high speed, otherwise they |
22 | connect to a companion controller. If you configure EHCI, you should | 22 | connect to a companion controller. If you configure EHCI, you should |
23 | probably configure the OHCI (for NEC and some other vendors) USB Host | 23 | probably configure the OHCI (for NEC and some other vendors) USB Host |
24 | Controller Driver or UHCI (for Via motherboards) Host Controller | 24 | Controller Driver or UHCI (for Via motherboards) Host Controller |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index af18355e94cc..4e9637eb6137 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -357,7 +357,7 @@ static int cypress_serial_control (struct usb_serial_port *port, unsigned baud_m | |||
357 | } while (retval != 5 && retval != ENODEV); | 357 | } while (retval != 5 && retval != ENODEV); |
358 | 358 | ||
359 | if (retval != 5) { | 359 | if (retval != 5) { |
360 | err("%s - failed to retreive serial line settings - %d", __FUNCTION__, retval); | 360 | err("%s - failed to retrieve serial line settings - %d", __FUNCTION__, retval); |
361 | return retval; | 361 | return retval; |
362 | } else { | 362 | } else { |
363 | spin_lock_irqsave(&priv->lock, flags); | 363 | spin_lock_irqsave(&priv->lock, flags); |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 8bc8337c99c4..4dd6865d32b0 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -584,7 +584,7 @@ static struct usb_serial_driver *search_serial_device(struct usb_interface *ifac | |||
584 | const struct usb_device_id *id; | 584 | const struct usb_device_id *id; |
585 | struct usb_serial_driver *t; | 585 | struct usb_serial_driver *t; |
586 | 586 | ||
587 | /* List trough know devices and see if the usb id matches */ | 587 | /* Check if the usb id matches a known device */ |
588 | list_for_each(p, &usb_serial_driver_list) { | 588 | list_for_each(p, &usb_serial_driver_list) { |
589 | t = list_entry(p, struct usb_serial_driver, driver_list); | 589 | t = list_entry(p, struct usb_serial_driver, driver_list); |
590 | id = usb_match_id(iface, t->id_table); | 590 | id = usb_match_id(iface, t->id_table); |
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c index ea7c86306918..7f9838dceab5 100644 --- a/drivers/video/aty/radeon_monitor.c +++ b/drivers/video/aty/radeon_monitor.c | |||
@@ -423,7 +423,7 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo, | |||
423 | /* | 423 | /* |
424 | * Probe display on both primary and secondary card's connector (if any) | 424 | * Probe display on both primary and secondary card's connector (if any) |
425 | * by various available techniques (i2c, OF device tree, BIOS, ...) and | 425 | * by various available techniques (i2c, OF device tree, BIOS, ...) and |
426 | * try to retreive EDID. The algorithm here comes from XFree's radeon | 426 | * try to retrieve EDID. The algorithm here comes from XFree's radeon |
427 | * driver | 427 | * driver |
428 | */ | 428 | */ |
429 | void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, | 429 | void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, |
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index d0244c04af5a..4ef5cd19609d 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile | |||
@@ -16,7 +16,7 @@ obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o | |||
16 | 16 | ||
17 | # How to generate logo's | 17 | # How to generate logo's |
18 | 18 | ||
19 | # Use logo-cfiles to retreive list of .c files to be built | 19 | # Use logo-cfiles to retrieve list of .c files to be built |
20 | logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ | 20 | logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \ |
21 | $(wildcard $(srctree)/$(src)/*$(1).$(2)))) | 21 | $(wildcard $(srctree)/$(src)/*$(1).$(2)))) |
22 | 22 | ||
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index 9a1e00dd3e02..4baf61a22327 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig | |||
@@ -3,7 +3,7 @@ menu "Dallas's 1-wire bus" | |||
3 | config W1 | 3 | config W1 |
4 | tristate "Dallas's 1-wire support" | 4 | tristate "Dallas's 1-wire support" |
5 | ---help--- | 5 | ---help--- |
6 | Dallas's 1-wire bus is usefull to connect slow 1-pin devices | 6 | Dallas's 1-wire bus is useful to connect slow 1-pin devices |
7 | such as iButtons and thermal sensors. | 7 | such as iButtons and thermal sensors. |
8 | 8 | ||
9 | If you want W1 support, you should say Y here. | 9 | If you want W1 support, you should say Y here. |
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index d933ef1fbd8a..a17b28854288 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -663,7 +663,7 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
663 | } | 663 | } |
664 | 664 | ||
665 | /** | 665 | /** |
666 | * v9fs_vfs_getattr - retreive file metadata | 666 | * v9fs_vfs_getattr - retrieve file metadata |
667 | * @mnt - mount information | 667 | * @mnt - mount information |
668 | * @dentry - file to get attributes on | 668 | * @dentry - file to get attributes on |
669 | * @stat - metadata structure to populate | 669 | * @stat - metadata structure to populate |
diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h index 134c2b5be0f2..82ce47607774 100644 --- a/include/asm-powerpc/smu.h +++ b/include/asm-powerpc/smu.h | |||
@@ -22,7 +22,7 @@ | |||
22 | /* | 22 | /* |
23 | * Partition info commands | 23 | * Partition info commands |
24 | * | 24 | * |
25 | * These commands are used to retreive the sdb-partition-XX datas from | 25 | * These commands are used to retrieve the sdb-partition-XX datas from |
26 | * the SMU. The lenght is always 2. First byte is the subcommand code | 26 | * the SMU. The lenght is always 2. First byte is the subcommand code |
27 | * and second byte is the partition ID. | 27 | * and second byte is the partition ID. |
28 | * | 28 | * |
@@ -225,7 +225,7 @@ | |||
225 | * | 225 | * |
226 | * SMU_CMD_MISC_ee_GET_DATABLOCK_REC is used, among others, to | 226 | * SMU_CMD_MISC_ee_GET_DATABLOCK_REC is used, among others, to |
227 | * transfer blocks of data from the SMU. So far, I've decrypted it's | 227 | * transfer blocks of data from the SMU. So far, I've decrypted it's |
228 | * usage to retreive partition data. In order to do that, you have to | 228 | * usage to retrieve partition data. In order to do that, you have to |
229 | * break your transfer in "chunks" since that command cannot transfer | 229 | * break your transfer in "chunks" since that command cannot transfer |
230 | * more than a chunk at a time. The chunk size used by OF is 0xe bytes, | 230 | * more than a chunk at a time. The chunk size used by OF is 0xe bytes, |
231 | * but it seems that the darwin driver will let you do 0x1e bytes if | 231 | * but it seems that the darwin driver will let you do 0x1e bytes if |
@@ -556,7 +556,7 @@ struct smu_user_cmd_hdr | |||
556 | __u32 cmdtype; | 556 | __u32 cmdtype; |
557 | #define SMU_CMDTYPE_SMU 0 /* SMU command */ | 557 | #define SMU_CMDTYPE_SMU 0 /* SMU command */ |
558 | #define SMU_CMDTYPE_WANTS_EVENTS 1 /* switch fd to events mode */ | 558 | #define SMU_CMDTYPE_WANTS_EVENTS 1 /* switch fd to events mode */ |
559 | #define SMU_CMDTYPE_GET_PARTITION 2 /* retreive an sdb partition */ | 559 | #define SMU_CMDTYPE_GET_PARTITION 2 /* retrieve an sdb partition */ |
560 | 560 | ||
561 | __u8 cmd; /* SMU command byte */ | 561 | __u8 cmd; /* SMU command byte */ |
562 | __u8 pad[3]; /* padding */ | 562 | __u8 pad[3]; /* padding */ |
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 4a6f50e31c73..23fe746a1d51 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
@@ -66,7 +66,7 @@ struct elevator_type | |||
66 | }; | 66 | }; |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * each queue has an elevator_queue assoicated with it | 69 | * each queue has an elevator_queue associated with it |
70 | */ | 70 | */ |
71 | struct elevator_queue | 71 | struct elevator_queue |
72 | { | 72 | { |
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index e7fa29e576dc..77f304680d86 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | |||
@@ -995,7 +995,7 @@ static int tcp_packet(struct ip_conntrack *conntrack, | |||
995 | || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) | 995 | || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) |
996 | && conntrack->proto.tcp.last_index == TCP_ACK_SET)) | 996 | && conntrack->proto.tcp.last_index == TCP_ACK_SET)) |
997 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { | 997 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { |
998 | /* RST sent to invalid SYN or ACK we had let trough | 998 | /* RST sent to invalid SYN or ACK we had let through |
999 | * at a) and c) above: | 999 | * at a) and c) above: |
1000 | * | 1000 | * |
1001 | * a) SYN was in window then | 1001 | * a) SYN was in window then |
@@ -1006,7 +1006,7 @@ static int tcp_packet(struct ip_conntrack *conntrack, | |||
1006 | * segments we ignored. */ | 1006 | * segments we ignored. */ |
1007 | goto in_window; | 1007 | goto in_window; |
1008 | } | 1008 | } |
1009 | /* Just fall trough */ | 1009 | /* Just fall through */ |
1010 | default: | 1010 | default: |
1011 | /* Keep compilers happy. */ | 1011 | /* Keep compilers happy. */ |
1012 | break; | 1012 | break; |
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 6167137a5cb5..9a1348a51a0d 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c | |||
@@ -988,7 +988,7 @@ static int tcp_packet(struct nf_conn *conntrack, | |||
988 | || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) | 988 | || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) |
989 | && conntrack->proto.tcp.last_index == TCP_ACK_SET)) | 989 | && conntrack->proto.tcp.last_index == TCP_ACK_SET)) |
990 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { | 990 | && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { |
991 | /* RST sent to invalid SYN or ACK we had let trough | 991 | /* RST sent to invalid SYN or ACK we had let through |
992 | * at a) and c) above: | 992 | * at a) and c) above: |
993 | * | 993 | * |
994 | * a) SYN was in window then | 994 | * a) SYN was in window then |
@@ -999,7 +999,7 @@ static int tcp_packet(struct nf_conn *conntrack, | |||
999 | * segments we ignored. */ | 999 | * segments we ignored. */ |
1000 | goto in_window; | 1000 | goto in_window; |
1001 | } | 1001 | } |
1002 | /* Just fall trough */ | 1002 | /* Just fall through */ |
1003 | default: | 1003 | default: |
1004 | /* Keep compilers happy. */ | 1004 | /* Keep compilers happy. */ |
1005 | break; | 1005 | break; |
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 0c4f3a9f2ea9..bf96a61d4b86 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost | |||
@@ -30,7 +30,7 @@ | |||
30 | # - See include/linux/module.h for more details | 30 | # - See include/linux/module.h for more details |
31 | 31 | ||
32 | # Step 4 is solely used to allow module versioning in external modules, | 32 | # Step 4 is solely used to allow module versioning in external modules, |
33 | # where the CRC of each module is retreived from the Module.symers file. | 33 | # where the CRC of each module is retrieved from the Module.symers file. |
34 | 34 | ||
35 | .PHONY: _modpost | 35 | .PHONY: _modpost |
36 | _modpost: __modpost | 36 | _modpost: __modpost |
diff --git a/scripts/mksysmap b/scripts/mksysmap index a6430e05972d..4390fab9f5bd 100644 --- a/scripts/mksysmap +++ b/scripts/mksysmap | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh -x | 1 | #!/bin/sh -x |
2 | # Based on the vmlinux file create the System.map file | 2 | # Based on the vmlinux file create the System.map file |
3 | # System.map is used by module-init tools and some debugging | 3 | # System.map is used by module-init tools and some debugging |
4 | # tools to retreive the actual addresses of symbols in the kernel. | 4 | # tools to retrieve the actual addresses of symbols in the kernel. |
5 | # | 5 | # |
6 | # Usage | 6 | # Usage |
7 | # mksysmap vmlinux System.map | 7 | # mksysmap vmlinux System.map |
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c index 09cb250d5827..962e6d525564 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | |||
@@ -209,7 +209,7 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs) | |||
209 | case SNDRV_PCM_FORMAT_S24_3LE: | 209 | case SNDRV_PCM_FORMAT_S24_3LE: |
210 | case SNDRV_PCM_FORMAT_S24_3BE: | 210 | case SNDRV_PCM_FORMAT_S24_3BE: |
211 | chip->pcm_sample = 3; | 211 | chip->pcm_sample = 3; |
212 | /* fall trough */ | 212 | /* fall through */ |
213 | default: /* 24-bit */ | 213 | default: /* 24-bit */ |
214 | aval = AK4117_DIF_24R; | 214 | aval = AK4117_DIF_24R; |
215 | chip->pcm_frame = 3; | 215 | chip->pcm_frame = 3; |