diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/testing/procfs-diskstats | 2 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-block | 2 | ||||
-rw-r--r-- | Documentation/DocBook/genericirq.tmpl | 4 | ||||
-rw-r--r-- | Documentation/DocBook/mtdnand.tmpl | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/videodev2.h.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/writing-an-alsa-driver.tmpl | 2 | ||||
-rw-r--r-- | Documentation/dvb/README.dvb-usb | 2 | ||||
-rw-r--r-- | Documentation/edac.txt | 7 | ||||
-rw-r--r-- | Documentation/lguest/lguest.c | 2 | ||||
-rw-r--r-- | Documentation/oops-tracing.txt | 2 | ||||
-rw-r--r-- | Documentation/power/regulator/consumer.txt | 2 | ||||
-rw-r--r-- | Documentation/scsi/ChangeLog.megaraid_sas | 2 | ||||
-rw-r--r-- | Documentation/spi/spi-summary | 2 | ||||
-rw-r--r-- | Documentation/sysctl/kernel.txt | 6 | ||||
-rw-r--r-- | Documentation/sysctl/vm.txt | 2 | ||||
-rw-r--r-- | Documentation/timers/hpet.txt | 2 | ||||
-rw-r--r-- | Documentation/video4linux/gspca.txt | 2 | ||||
-rw-r--r-- | Documentation/vm/page-types.c | 2 | ||||
-rw-r--r-- | Documentation/vm/slub.txt | 2 |
19 files changed, 25 insertions, 24 deletions
diff --git a/Documentation/ABI/testing/procfs-diskstats b/Documentation/ABI/testing/procfs-diskstats index 99233902e09e..f91a973a37fe 100644 --- a/Documentation/ABI/testing/procfs-diskstats +++ b/Documentation/ABI/testing/procfs-diskstats | |||
@@ -8,7 +8,7 @@ Description: | |||
8 | 1 - major number | 8 | 1 - major number |
9 | 2 - minor mumber | 9 | 2 - minor mumber |
10 | 3 - device name | 10 | 3 - device name |
11 | 4 - reads completed succesfully | 11 | 4 - reads completed successfully |
12 | 5 - reads merged | 12 | 5 - reads merged |
13 | 6 - sectors read | 13 | 6 - sectors read |
14 | 7 - time spent reading (ms) | 14 | 7 - time spent reading (ms) |
diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block index 5f3bedaf8e35..d2f90334bb93 100644 --- a/Documentation/ABI/testing/sysfs-block +++ b/Documentation/ABI/testing/sysfs-block | |||
@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com> | |||
4 | Description: | 4 | Description: |
5 | The /sys/block/<disk>/stat files displays the I/O | 5 | The /sys/block/<disk>/stat files displays the I/O |
6 | statistics of disk <disk>. They contain 11 fields: | 6 | statistics of disk <disk>. They contain 11 fields: |
7 | 1 - reads completed succesfully | 7 | 1 - reads completed successfully |
8 | 2 - reads merged | 8 | 2 - reads merged |
9 | 3 - sectors read | 9 | 3 - sectors read |
10 | 4 - time spent reading (ms) | 10 | 4 - time spent reading (ms) |
diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl index c671a0168096..1448b33fd222 100644 --- a/Documentation/DocBook/genericirq.tmpl +++ b/Documentation/DocBook/genericirq.tmpl | |||
@@ -417,8 +417,8 @@ desc->chip->end(); | |||
417 | </para> | 417 | </para> |
418 | <para> | 418 | <para> |
419 | To make use of the split implementation, replace the call to | 419 | To make use of the split implementation, replace the call to |
420 | __do_IRQ by a call to desc->chip->handle_irq() and associate | 420 | __do_IRQ by a call to desc->handle_irq() and associate |
421 | the appropriate handler function to desc->chip->handle_irq(). | 421 | the appropriate handler function to desc->handle_irq(). |
422 | In most cases the generic handler implementations should | 422 | In most cases the generic handler implementations should |
423 | be sufficient. | 423 | be sufficient. |
424 | </para> | 424 | </para> |
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index df0d089d0fb9..f508a8a27fea 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
@@ -362,7 +362,7 @@ module_exit(board_cleanup); | |||
362 | <sect1 id="Multiple_chip_control"> | 362 | <sect1 id="Multiple_chip_control"> |
363 | <title>Multiple chip control</title> | 363 | <title>Multiple chip control</title> |
364 | <para> | 364 | <para> |
365 | The nand driver can control chip arrays. Therefor the | 365 | The nand driver can control chip arrays. Therefore the |
366 | board driver must provide an own select_chip function. This | 366 | board driver must provide an own select_chip function. This |
367 | function must (de)select the requested chip. | 367 | function must (de)select the requested chip. |
368 | The function pointer in the nand_chip structure must | 368 | The function pointer in the nand_chip structure must |
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml index 97002060ac4f..26303e58345f 100644 --- a/Documentation/DocBook/v4l/videodev2.h.xml +++ b/Documentation/DocBook/v4l/videodev2.h.xml | |||
@@ -492,7 +492,7 @@ struct <link linkend="v4l2-jpegcompression">v4l2_jpegcompression</link> { | |||
492 | * you do, leave them untouched. | 492 | * you do, leave them untouched. |
493 | * Inluding less markers will make the | 493 | * Inluding less markers will make the |
494 | * resulting code smaller, but there will | 494 | * resulting code smaller, but there will |
495 | * be fewer aplications which can read it. | 495 | * be fewer applications which can read it. |
496 | * The presence of the APP and COM marker | 496 | * The presence of the APP and COM marker |
497 | * is influenced by APP_len and COM_len | 497 | * is influenced by APP_len and COM_len |
498 | * ONLY, not by this property! */ | 498 | * ONLY, not by this property! */ |
diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index 7a2e0e98986a..0d0f7b4d4b1a 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl | |||
@@ -5318,7 +5318,7 @@ struct _snd_pcm_runtime { | |||
5318 | pages of the given size and map them onto the virtually contiguous | 5318 | pages of the given size and map them onto the virtually contiguous |
5319 | memory. The virtual pointer is addressed in runtime->dma_area. | 5319 | memory. The virtual pointer is addressed in runtime->dma_area. |
5320 | The physical address (runtime->dma_addr) is set to zero, | 5320 | The physical address (runtime->dma_addr) is set to zero, |
5321 | because the buffer is physically non-contigous. | 5321 | because the buffer is physically non-contiguous. |
5322 | The physical address table is set up in sgbuf->table. | 5322 | The physical address table is set up in sgbuf->table. |
5323 | You can get the physical address at a certain offset via | 5323 | You can get the physical address at a certain offset via |
5324 | <function>snd_pcm_sgbuf_get_addr()</function>. | 5324 | <function>snd_pcm_sgbuf_get_addr()</function>. |
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb index bf2a9cdfe7bb..c8238e44ed6b 100644 --- a/Documentation/dvb/README.dvb-usb +++ b/Documentation/dvb/README.dvb-usb | |||
@@ -85,7 +85,7 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB | |||
85 | - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems | 85 | - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems |
86 | better settled there (added xfer_ops-struct) | 86 | better settled there (added xfer_ops-struct) |
87 | - created a common files for frontends (mc/p/mb) | 87 | - created a common files for frontends (mc/p/mb) |
88 | 2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek) | 88 | 2004-09-28 - added support for a new device (Unknown, vendor ID is Hyper-Paltek) |
89 | 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks | 89 | 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks |
90 | to Amaury Demol for reporting | 90 | to Amaury Demol for reporting |
91 | - changed usb TS transfer method (several urbs, stopping transfer | 91 | - changed usb TS transfer method (several urbs, stopping transfer |
diff --git a/Documentation/edac.txt b/Documentation/edac.txt index 06f8f46692dc..79c533223762 100644 --- a/Documentation/edac.txt +++ b/Documentation/edac.txt | |||
@@ -80,7 +80,7 @@ is: | |||
80 | 80 | ||
81 | broken_parity_status | 81 | broken_parity_status |
82 | 82 | ||
83 | as is located in /sys/devices/pci<XXX>/0000:XX:YY.Z directorys for | 83 | as is located in /sys/devices/pci<XXX>/0000:XX:YY.Z directories for |
84 | PCI devices. | 84 | PCI devices. |
85 | 85 | ||
86 | FUTURE HARDWARE SCANNING | 86 | FUTURE HARDWARE SCANNING |
@@ -288,9 +288,8 @@ Total UE count that had no information attribute fileY: | |||
288 | 288 | ||
289 | 'ue_noinfo_count' | 289 | 'ue_noinfo_count' |
290 | 290 | ||
291 | This attribute file displays the number of UEs that | 291 | This attribute file displays the number of UEs that have occurred |
292 | have occurred have occurred with no informations as to which DIMM | 292 | with no information as to which DIMM slot is having errors. |
293 | slot is having errors. | ||
294 | 293 | ||
295 | 294 | ||
296 | Total Correctable Errors count attribute file: | 295 | Total Correctable Errors count attribute file: |
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index 098de5bce00a..42208511b5c0 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
@@ -304,7 +304,7 @@ static void *map_zeroed_pages(unsigned int num) | |||
304 | addr = mmap(NULL, getpagesize() * num, | 304 | addr = mmap(NULL, getpagesize() * num, |
305 | PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0); | 305 | PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0); |
306 | if (addr == MAP_FAILED) | 306 | if (addr == MAP_FAILED) |
307 | err(1, "Mmaping %u pages of /dev/zero", num); | 307 | err(1, "Mmapping %u pages of /dev/zero", num); |
308 | 308 | ||
309 | /* | 309 | /* |
310 | * One neat mmap feature is that you can close the fd, and it | 310 | * One neat mmap feature is that you can close the fd, and it |
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt index b152e81da592..c10c022b911c 100644 --- a/Documentation/oops-tracing.txt +++ b/Documentation/oops-tracing.txt | |||
@@ -257,6 +257,8 @@ characters, each representing a particular tainted value. | |||
257 | 257 | ||
258 | 10: 'W' if a warning has previously been issued by the kernel. | 258 | 10: 'W' if a warning has previously been issued by the kernel. |
259 | 259 | ||
260 | 11: 'C' if a staging driver has been loaded. | ||
261 | |||
260 | The primary reason for the 'Tainted: ' string is to tell kernel | 262 | The primary reason for the 'Tainted: ' string is to tell kernel |
261 | debuggers if this is a clean kernel or if anything unusual has | 263 | debuggers if this is a clean kernel or if anything unusual has |
262 | occurred. Tainting is permanent: even if an offending module is | 264 | occurred. Tainting is permanent: even if an offending module is |
diff --git a/Documentation/power/regulator/consumer.txt b/Documentation/power/regulator/consumer.txt index 5f83fd24ea84..cdebb5145c25 100644 --- a/Documentation/power/regulator/consumer.txt +++ b/Documentation/power/regulator/consumer.txt | |||
@@ -104,7 +104,7 @@ to set the limit to 500mA when supplying power. | |||
104 | 104 | ||
105 | Consumers can control their supply current limit by calling :- | 105 | Consumers can control their supply current limit by calling :- |
106 | 106 | ||
107 | int regulator_set_current_limit(regulator, min_uV, max_uV); | 107 | int regulator_set_current_limit(regulator, min_uA, max_uA); |
108 | 108 | ||
109 | Where min_uA and max_uA are the minimum and maximum acceptable current limit in | 109 | Where min_uA and max_uA are the minimum and maximum acceptable current limit in |
110 | microamps. | 110 | microamps. |
diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas index 151a7b718b8c..17ffa0607712 100644 --- a/Documentation/scsi/ChangeLog.megaraid_sas +++ b/Documentation/scsi/ChangeLog.megaraid_sas | |||
@@ -247,7 +247,7 @@ ii. FW enables WCE bit in Mode Sense cmd for drives that are configured | |||
247 | Disks are exposed with WCE=1. User is advised to enable Write Back | 247 | Disks are exposed with WCE=1. User is advised to enable Write Back |
248 | mode only when the controller has battery backup. At this time | 248 | mode only when the controller has battery backup. At this time |
249 | Synhronize cache is not supported by the FW. Driver will short-cycle | 249 | Synhronize cache is not supported by the FW. Driver will short-cycle |
250 | the cmd and return sucess without sending down to FW. | 250 | the cmd and return success without sending down to FW. |
251 | 251 | ||
252 | 1 Release Date : Sun Jan. 14 11:21:32 PDT 2007 - | 252 | 1 Release Date : Sun Jan. 14 11:21:32 PDT 2007 - |
253 | Sumant Patro <Sumant.Patro@lsil.com>/Bo Yang | 253 | Sumant Patro <Sumant.Patro@lsil.com>/Bo Yang |
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index deab51ddc33e..4884cb33845d 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary | |||
@@ -538,7 +538,7 @@ SPI MESSAGE QUEUE | |||
538 | The bulk of the driver will be managing the I/O queue fed by transfer(). | 538 | The bulk of the driver will be managing the I/O queue fed by transfer(). |
539 | 539 | ||
540 | That queue could be purely conceptual. For example, a driver used only | 540 | That queue could be purely conceptual. For example, a driver used only |
541 | for low-frequency sensor acess might be fine using synchronous PIO. | 541 | for low-frequency sensor access might be fine using synchronous PIO. |
542 | 542 | ||
543 | But the queue will probably be very real, using message->queue, PIO, | 543 | But the queue will probably be very real, using message->queue, PIO, |
544 | often DMA (especially if the root filesystem is in SPI flash), and | 544 | often DMA (especially if the root filesystem is in SPI flash), and |
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index a028b92001ed..8f7a0e73ef44 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
@@ -139,9 +139,9 @@ core_pattern is used to specify a core dumpfile pattern name. | |||
139 | core_pipe_limit: | 139 | core_pipe_limit: |
140 | 140 | ||
141 | This sysctl is only applicable when core_pattern is configured to pipe core | 141 | This sysctl is only applicable when core_pattern is configured to pipe core |
142 | files to user space helper a (when the first character of core_pattern is a '|', | 142 | files to a user space helper (when the first character of core_pattern is a '|', |
143 | see above). When collecting cores via a pipe to an application, it is | 143 | see above). When collecting cores via a pipe to an application, it is |
144 | occasionally usefull for the collecting application to gather data about the | 144 | occasionally useful for the collecting application to gather data about the |
145 | crashing process from its /proc/pid directory. In order to do this safely, the | 145 | crashing process from its /proc/pid directory. In order to do this safely, the |
146 | kernel must wait for the collecting process to exit, so as not to remove the | 146 | kernel must wait for the collecting process to exit, so as not to remove the |
147 | crashing processes proc files prematurely. This in turn creates the possibility | 147 | crashing processes proc files prematurely. This in turn creates the possibility |
@@ -152,7 +152,7 @@ applications in parallel. If this value is exceeded, then those crashing | |||
152 | processes above that value are noted via the kernel log and their cores are | 152 | processes above that value are noted via the kernel log and their cores are |
153 | skipped. 0 is a special value, indicating that unlimited processes may be | 153 | skipped. 0 is a special value, indicating that unlimited processes may be |
154 | captured in parallel, but that no waiting will take place (i.e. the collecting | 154 | captured in parallel, but that no waiting will take place (i.e. the collecting |
155 | process is not guaranteed access to /proc/<crahing pid>/). This value defaults | 155 | process is not guaranteed access to /proc/<crashing pid>/). This value defaults |
156 | to 0. | 156 | to 0. |
157 | 157 | ||
158 | ============================================================== | 158 | ============================================================== |
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt index a6e360d2055c..fc5790d36cd9 100644 --- a/Documentation/sysctl/vm.txt +++ b/Documentation/sysctl/vm.txt | |||
@@ -370,7 +370,7 @@ The default is 1 percent. | |||
370 | mmap_min_addr | 370 | mmap_min_addr |
371 | 371 | ||
372 | This file indicates the amount of address space which a user process will | 372 | This file indicates the amount of address space which a user process will |
373 | be restricted from mmaping. Since kernel null dereference bugs could | 373 | be restricted from mmapping. Since kernel null dereference bugs could |
374 | accidentally operate based on the information in the first couple of pages | 374 | accidentally operate based on the information in the first couple of pages |
375 | of memory userspace processes should not be allowed to write to them. By | 375 | of memory userspace processes should not be allowed to write to them. By |
376 | default this value is set to 0 and no protections will be enforced by the | 376 | default this value is set to 0 and no protections will be enforced by the |
diff --git a/Documentation/timers/hpet.txt b/Documentation/timers/hpet.txt index 04763a325520..16d25e6b5a00 100644 --- a/Documentation/timers/hpet.txt +++ b/Documentation/timers/hpet.txt | |||
@@ -3,7 +3,7 @@ | |||
3 | The High Precision Event Timer (HPET) hardware follows a specification | 3 | The High Precision Event Timer (HPET) hardware follows a specification |
4 | by Intel and Microsoft which can be found at | 4 | by Intel and Microsoft which can be found at |
5 | 5 | ||
6 | http://www.intel.com/technology/architecture/hpetspec.htm | 6 | http://www.intel.com/hardwaredesign/hpetspec_1.pdf |
7 | 7 | ||
8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") | 8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") |
9 | and up to 32 comparators. Normally three or more comparators are provided, | 9 | and up to 32 comparators. Normally three or more comparators are provided, |
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 3f61825be499..6b29555b58b7 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
@@ -6,7 +6,7 @@ The modules are: | |||
6 | 6 | ||
7 | xxxx vend:prod | 7 | xxxx vend:prod |
8 | ---- | 8 | ---- |
9 | spca501 0000:0000 MystFromOri Unknow Camera | 9 | spca501 0000:0000 MystFromOri Unknown Camera |
10 | m5602 0402:5602 ALi Video Camera Controller | 10 | m5602 0402:5602 ALi Video Camera Controller |
11 | spca501 040a:0002 Kodak DVC-325 | 11 | spca501 040a:0002 Kodak DVC-325 |
12 | spca500 040a:0300 Kodak EZ200 | 12 | spca500 040a:0300 Kodak EZ200 |
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c index 4793c6aac733..ea44ea502da1 100644 --- a/Documentation/vm/page-types.c +++ b/Documentation/vm/page-types.c | |||
@@ -301,7 +301,7 @@ static char *page_flag_name(uint64_t flags) | |||
301 | present = (flags >> i) & 1; | 301 | present = (flags >> i) & 1; |
302 | if (!page_flag_names[i]) { | 302 | if (!page_flag_names[i]) { |
303 | if (present) | 303 | if (present) |
304 | fatal("unkown flag bit %d\n", i); | 304 | fatal("unknown flag bit %d\n", i); |
305 | continue; | 305 | continue; |
306 | } | 306 | } |
307 | buf[j++] = present ? page_flag_names[i][0] : '_'; | 307 | buf[j++] = present ? page_flag_names[i][0] : '_'; |
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 510917ff59ed..b37300edf27c 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt | |||
@@ -245,7 +245,7 @@ been overwritten. Here a string of 8 characters was written into a slab that | |||
245 | has the length of 8 characters. However, a 8 character string needs a | 245 | has the length of 8 characters. However, a 8 character string needs a |
246 | terminating 0. That zero has overwritten the first byte of the Redzone field. | 246 | terminating 0. That zero has overwritten the first byte of the Redzone field. |
247 | After reporting the details of the issue encountered the FIX SLUB message | 247 | After reporting the details of the issue encountered the FIX SLUB message |
248 | tell us that SLUB has restored the Redzone to its proper value and then | 248 | tells us that SLUB has restored the Redzone to its proper value and then |
249 | system operations continue. | 249 | system operations continue. |
250 | 250 | ||
251 | Emergency operations: | 251 | Emergency operations: |