diff options
33 files changed, 48 insertions, 48 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index f9df3b872c16..6dd8d10d6b7e 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -434,7 +434,7 @@ char *date;</synopsis> | |||
434 | The DRM core includes two memory managers, namely Translation Table Maps | 434 | The DRM core includes two memory managers, namely Translation Table Maps |
435 | (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory | 435 | (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory |
436 | manager to be developed and tried to be a one-size-fits-them all | 436 | manager to be developed and tried to be a one-size-fits-them all |
437 | solution. It provides a single userspace API to accomodate the need of | 437 | solution. It provides a single userspace API to accommodate the need of |
438 | all hardware, supporting both Unified Memory Architecture (UMA) devices | 438 | all hardware, supporting both Unified Memory Architecture (UMA) devices |
439 | and devices with dedicated video RAM (i.e. most discrete video cards). | 439 | and devices with dedicated video RAM (i.e. most discrete video cards). |
440 | This resulted in a large, complex piece of code that turned out to be | 440 | This resulted in a large, complex piece of code that turned out to be |
@@ -701,7 +701,7 @@ char *date;</synopsis> | |||
701 | <para> | 701 | <para> |
702 | Similar to global names, GEM file descriptors are also used to share GEM | 702 | Similar to global names, GEM file descriptors are also used to share GEM |
703 | objects across processes. They offer additional security: as file | 703 | objects across processes. They offer additional security: as file |
704 | descriptors must be explictly sent over UNIX domain sockets to be shared | 704 | descriptors must be explicitly sent over UNIX domain sockets to be shared |
705 | between applications, they can't be guessed like the globally unique GEM | 705 | between applications, they can't be guessed like the globally unique GEM |
706 | names. | 706 | names. |
707 | </para> | 707 | </para> |
@@ -1154,7 +1154,7 @@ int max_width, max_height;</synopsis> | |||
1154 | </para> | 1154 | </para> |
1155 | <para> | 1155 | <para> |
1156 | The <methodname>page_flip</methodname> operation schedules a page flip. | 1156 | The <methodname>page_flip</methodname> operation schedules a page flip. |
1157 | Once any pending rendering targetting the new frame buffer has | 1157 | Once any pending rendering targeting the new frame buffer has |
1158 | completed, the CRTC will be reprogrammed to display that frame buffer | 1158 | completed, the CRTC will be reprogrammed to display that frame buffer |
1159 | after the next vertical refresh. The operation must return immediately | 1159 | after the next vertical refresh. The operation must return immediately |
1160 | without waiting for rendering or page flip to complete and must block | 1160 | without waiting for rendering or page flip to complete and must block |
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml index df39ba395df0..0d6e81bd9ed2 100644 --- a/Documentation/DocBook/media/dvb/frontend.xml +++ b/Documentation/DocBook/media/dvb/frontend.xml | |||
@@ -233,7 +233,7 @@ typedef enum fe_status { | |||
233 | <entry align="char">The frontend FEC inner coding (Viterbi, LDPC or other inner code) is stable</entry> | 233 | <entry align="char">The frontend FEC inner coding (Viterbi, LDPC or other inner code) is stable</entry> |
234 | </row><row> | 234 | </row><row> |
235 | <entry align="char">FE_HAS_SYNC</entry> | 235 | <entry align="char">FE_HAS_SYNC</entry> |
236 | <entry align="char">Syncronization bytes was found</entry> | 236 | <entry align="char">Synchronization bytes was found</entry> |
237 | </row><row> | 237 | </row><row> |
238 | <entry align="char">FE_HAS_LOCK</entry> | 238 | <entry align="char">FE_HAS_LOCK</entry> |
239 | <entry align="char">The DVB were locked and everything is working</entry> | 239 | <entry align="char">The DVB were locked and everything is working</entry> |
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 8d7a77928d49..c2fc9ec1417e 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
@@ -3147,7 +3147,7 @@ giving priority to the center of the metered area.</entry> | |||
3147 | <entry>A multi-zone metering. The light intensity is measured | 3147 | <entry>A multi-zone metering. The light intensity is measured |
3148 | in several points of the frame and the the results are combined. The | 3148 | in several points of the frame and the the results are combined. The |
3149 | algorithm of the zones selection and their significance in calculating the | 3149 | algorithm of the zones selection and their significance in calculating the |
3150 | final value is device dependant.</entry> | 3150 | final value is device dependent.</entry> |
3151 | </row> | 3151 | </row> |
3152 | </tbody> | 3152 | </tbody> |
3153 | </entrytbl> | 3153 | </entrytbl> |
diff --git a/Documentation/DocBook/writing_usb_driver.tmpl b/Documentation/DocBook/writing_usb_driver.tmpl index bd97a13fa5ae..3210dcf741c9 100644 --- a/Documentation/DocBook/writing_usb_driver.tmpl +++ b/Documentation/DocBook/writing_usb_driver.tmpl | |||
@@ -83,7 +83,7 @@ | |||
83 | </para> | 83 | </para> |
84 | <para> | 84 | <para> |
85 | Because each different protocol causes a new driver to be created, I have | 85 | Because each different protocol causes a new driver to be created, I have |
86 | written a generic USB driver skeleton, modeled after the pci-skeleton.c | 86 | written a generic USB driver skeleton, modelled after the pci-skeleton.c |
87 | file in the kernel source tree upon which many PCI network drivers have | 87 | file in the kernel source tree upon which many PCI network drivers have |
88 | been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c | 88 | been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c |
89 | in the kernel source tree. In this article I will walk through the basics | 89 | in the kernel source tree. In this article I will walk through the basics |
diff --git a/Documentation/bcache.txt b/Documentation/bcache.txt index 77db8809bd96..2cdd4cfc6912 100644 --- a/Documentation/bcache.txt +++ b/Documentation/bcache.txt | |||
@@ -181,7 +181,7 @@ want for getting the best possible numbers when benchmarking. | |||
181 | 181 | ||
182 | In practice this isn't an issue because as soon as a write comes along it'll | 182 | In practice this isn't an issue because as soon as a write comes along it'll |
183 | cause the btree node to be split, and you need almost no write traffic for | 183 | cause the btree node to be split, and you need almost no write traffic for |
184 | this to not show up enough to be noticable (especially since bcache's btree | 184 | this to not show up enough to be noticeable (especially since bcache's btree |
185 | nodes are huge and index large regions of the device). But when you're | 185 | nodes are huge and index large regions of the device). But when you're |
186 | benchmarking, if you're trying to warm the cache by reading a bunch of data | 186 | benchmarking, if you're trying to warm the cache by reading a bunch of data |
187 | and there's no other traffic - that can be a problem. | 187 | and there's no other traffic - that can be a problem. |
@@ -222,7 +222,7 @@ running | |||
222 | it's in passthrough mode or caching). | 222 | it's in passthrough mode or caching). |
223 | 223 | ||
224 | sequential_cutoff | 224 | sequential_cutoff |
225 | A sequential IO will bypass the cache once it passes this threshhold; the | 225 | A sequential IO will bypass the cache once it passes this threshold; the |
226 | most recent 128 IOs are tracked so sequential IO can be detected even when | 226 | most recent 128 IOs are tracked so sequential IO can be detected even when |
227 | it isn't all done at once. | 227 | it isn't all done at once. |
228 | 228 | ||
@@ -296,7 +296,7 @@ cache_miss_collisions | |||
296 | since the synchronization for cache misses was rewritten) | 296 | since the synchronization for cache misses was rewritten) |
297 | 297 | ||
298 | cache_readaheads | 298 | cache_readaheads |
299 | Count of times readahead occured. | 299 | Count of times readahead occurred. |
300 | 300 | ||
301 | SYSFS - CACHE SET: | 301 | SYSFS - CACHE SET: |
302 | 302 | ||
@@ -359,7 +359,7 @@ unregister | |||
359 | SYSFS - CACHE SET INTERNAL: | 359 | SYSFS - CACHE SET INTERNAL: |
360 | 360 | ||
361 | This directory also exposes timings for a number of internal operations, with | 361 | This directory also exposes timings for a number of internal operations, with |
362 | separate files for average duration, average frequency, last occurence and max | 362 | separate files for average duration, average frequency, last occurrence and max |
363 | duration: garbage collection, btree read, btree node sorts and btree splits. | 363 | duration: garbage collection, btree read, btree node sorts and btree splits. |
364 | 364 | ||
365 | active_journal_entries | 365 | active_journal_entries |
@@ -414,7 +414,7 @@ freelist_percent | |||
414 | space. | 414 | space. |
415 | 415 | ||
416 | io_errors | 416 | io_errors |
417 | Number of errors that have occured, decayed by io_error_halflife. | 417 | Number of errors that have occurred, decayed by io_error_halflife. |
418 | 418 | ||
419 | metadata_written | 419 | metadata_written |
420 | Sum of all non data writes (btree writes and all other metadata). | 420 | Sum of all non data writes (btree writes and all other metadata). |
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt index e54ac1d53403..7d2d046c265f 100644 --- a/Documentation/block/queue-sysfs.txt +++ b/Documentation/block/queue-sysfs.txt | |||
@@ -93,7 +93,7 @@ To avoid priority inversion through request starvation, a request | |||
93 | queue maintains a separate request pool per each cgroup when | 93 | queue maintains a separate request pool per each cgroup when |
94 | CONFIG_BLK_CGROUP is enabled, and this parameter applies to each such | 94 | CONFIG_BLK_CGROUP is enabled, and this parameter applies to each such |
95 | per-block-cgroup request pool. IOW, if there are N block cgroups, | 95 | per-block-cgroup request pool. IOW, if there are N block cgroups, |
96 | each request queue may have upto N request pools, each independently | 96 | each request queue may have up to N request pools, each independently |
97 | regulated by nr_requests. | 97 | regulated by nr_requests. |
98 | 98 | ||
99 | optimal_io_size (RO) | 99 | optimal_io_size (RO) |
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index ddf4f93967a9..3aaf7870a93e 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt | |||
@@ -304,7 +304,7 @@ kernel memory, we prevent new processes from being created when the kernel | |||
304 | memory usage is too high. | 304 | memory usage is too high. |
305 | 305 | ||
306 | * slab pages: pages allocated by the SLAB or SLUB allocator are tracked. A copy | 306 | * slab pages: pages allocated by the SLAB or SLUB allocator are tracked. A copy |
307 | of each kmem_cache is created everytime the cache is touched by the first time | 307 | of each kmem_cache is created every time the cache is touched by the first time |
308 | from inside the memcg. The creation is done lazily, so some objects can still be | 308 | from inside the memcg. The creation is done lazily, so some objects can still be |
309 | skipped while the cache is being created. All objects in a slab page should | 309 | skipped while the cache is being created. All objects in a slab page should |
310 | belong to the same memcg. This only fails to hold when a task is migrated to a | 310 | belong to the same memcg. This only fails to hold when a task is migrated to a |
diff --git a/Documentation/device-mapper/cache.txt b/Documentation/device-mapper/cache.txt index f50470abe241..e8cdf7241b66 100644 --- a/Documentation/device-mapper/cache.txt +++ b/Documentation/device-mapper/cache.txt | |||
@@ -87,7 +87,7 @@ Migration throttling | |||
87 | 87 | ||
88 | Migrating data between the origin and cache device uses bandwidth. | 88 | Migrating data between the origin and cache device uses bandwidth. |
89 | The user can set a throttle to prevent more than a certain amount of | 89 | The user can set a throttle to prevent more than a certain amount of |
90 | migration occuring at any one time. Currently we're not taking any | 90 | migration occurring at any one time. Currently we're not taking any |
91 | account of normal io traffic going to the devices. More work needs | 91 | account of normal io traffic going to the devices. More work needs |
92 | doing here to avoid migrating during those peak io moments. | 92 | doing here to avoid migrating during those peak io moments. |
93 | 93 | ||
diff --git a/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt b/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt index f2f2171e530e..9e5f73412cd7 100644 --- a/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt +++ b/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt | |||
@@ -5,7 +5,7 @@ can combine interrupt sources as a group and provide a single interrupt request | |||
5 | for the group. The interrupt request from each group are connected to a parent | 5 | for the group. The interrupt request from each group are connected to a parent |
6 | interrupt controller, such as GIC in case of Exynos4210. | 6 | interrupt controller, such as GIC in case of Exynos4210. |
7 | 7 | ||
8 | The interrupt combiner controller consists of multiple combiners. Upto eight | 8 | The interrupt combiner controller consists of multiple combiners. Up to eight |
9 | interrupt sources can be connected to a combiner. The combiner outputs one | 9 | interrupt sources can be connected to a combiner. The combiner outputs one |
10 | combined interrupt for its eight interrupt sources. The combined interrupt | 10 | combined interrupt for its eight interrupt sources. The combined interrupt |
11 | is usually connected to a parent interrupt controller. | 11 | is usually connected to a parent interrupt controller. |
@@ -14,8 +14,8 @@ A single node in the device tree is used to describe the interrupt combiner | |||
14 | controller module (which includes multiple combiners). A combiner in the | 14 | controller module (which includes multiple combiners). A combiner in the |
15 | interrupt controller module shares config/control registers with other | 15 | interrupt controller module shares config/control registers with other |
16 | combiners. For example, a 32-bit interrupt enable/disable config register | 16 | combiners. For example, a 32-bit interrupt enable/disable config register |
17 | can accommodate upto 4 interrupt combiners (with each combiner supporting | 17 | can accommodate up to 4 interrupt combiners (with each combiner supporting |
18 | upto 8 interrupt sources). | 18 | up to 8 interrupt sources). |
19 | 19 | ||
20 | Required properties: | 20 | Required properties: |
21 | - compatible: should be "samsung,exynos4210-combiner". | 21 | - compatible: should be "samsung,exynos4210-combiner". |
diff --git a/Documentation/devicetree/bindings/arm/spear/shirq.txt b/Documentation/devicetree/bindings/arm/spear/shirq.txt index 13fbb8866bd6..715a013ed4bd 100644 --- a/Documentation/devicetree/bindings/arm/spear/shirq.txt +++ b/Documentation/devicetree/bindings/arm/spear/shirq.txt | |||
@@ -14,7 +14,7 @@ A single node in the device tree is used to describe the shared | |||
14 | interrupt multiplexor (one node for all groups). A group in the | 14 | interrupt multiplexor (one node for all groups). A group in the |
15 | interrupt controller shares config/control registers with other groups. | 15 | interrupt controller shares config/control registers with other groups. |
16 | For example, a 32-bit interrupt enable/disable config register can | 16 | For example, a 32-bit interrupt enable/disable config register can |
17 | accommodate upto 4 interrupt groups. | 17 | accommodate up to 4 interrupt groups. |
18 | 18 | ||
19 | Required properties: | 19 | Required properties: |
20 | - compatible: should be, either of | 20 | - compatible: should be, either of |
diff --git a/Documentation/devicetree/bindings/clock/silabs,si5351.txt b/Documentation/devicetree/bindings/clock/silabs,si5351.txt index cc374651662c..04feb13d6b29 100644 --- a/Documentation/devicetree/bindings/clock/silabs,si5351.txt +++ b/Documentation/devicetree/bindings/clock/silabs,si5351.txt | |||
@@ -4,7 +4,7 @@ Reference | |||
4 | [1] Si5351A/B/C Data Sheet | 4 | [1] Si5351A/B/C Data Sheet |
5 | http://www.silabs.com/Support%20Documents/TechnicalDocs/Si5351.pdf | 5 | http://www.silabs.com/Support%20Documents/TechnicalDocs/Si5351.pdf |
6 | 6 | ||
7 | The Si5351a/b/c are programmable i2c clock generators with upto 8 output | 7 | The Si5351a/b/c are programmable i2c clock generators with up to 8 output |
8 | clocks. Si5351a also has a reduced pin-count package (MSOP10) where only | 8 | clocks. Si5351a also has a reduced pin-count package (MSOP10) where only |
9 | 3 output clocks are accessible. The internal structure of the clock | 9 | 3 output clocks are accessible. The internal structure of the clock |
10 | generators can be found in [1]. | 10 | generators can be found in [1]. |
diff --git a/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt index 726fd2122a13..1180d7814af8 100644 --- a/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt | |||
@@ -51,7 +51,7 @@ Optional properties: | |||
51 | * card-detect-delay: Delay in milli-seconds before detecting card after card | 51 | * card-detect-delay: Delay in milli-seconds before detecting card after card |
52 | insert event. The default value is 0. | 52 | insert event. The default value is 0. |
53 | 53 | ||
54 | * supports-highspeed: Enables support for high speed cards (upto 50MHz) | 54 | * supports-highspeed: Enables support for high speed cards (up to 50MHz) |
55 | 55 | ||
56 | * broken-cd: as documented in mmc core bindings. | 56 | * broken-cd: as documented in mmc core bindings. |
57 | 57 | ||
diff --git a/Documentation/devicetree/bindings/powerpc/4xx/emac.txt b/Documentation/devicetree/bindings/powerpc/4xx/emac.txt index 2161334a7ca5..712baf6c3e24 100644 --- a/Documentation/devicetree/bindings/powerpc/4xx/emac.txt +++ b/Documentation/devicetree/bindings/powerpc/4xx/emac.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | 4xx/Axon EMAC ethernet nodes | 1 | 4xx/Axon EMAC ethernet nodes |
2 | 2 | ||
3 | The EMAC ethernet controller in IBM and AMCC 4xx chips, and also | 3 | The EMAC ethernet controller in IBM and AMCC 4xx chips, and also |
4 | the Axon bridge. To operate this needs to interact with a ths | 4 | the Axon bridge. To operate this needs to interact with a this |
5 | special McMAL DMA controller, and sometimes an RGMII or ZMII | 5 | special McMAL DMA controller, and sometimes an RGMII or ZMII |
6 | interface. In addition to the nodes and properties described | 6 | interface. In addition to the nodes and properties described |
7 | below, the node for the OPB bus on which the EMAC sits must have a | 7 | below, the node for the OPB bus on which the EMAC sits must have a |
diff --git a/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt b/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt index 8bf89c643640..f11f295c8450 100644 --- a/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt +++ b/Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt | |||
@@ -2,7 +2,7 @@ Broadcom BCM2835 SPI0 controller | |||
2 | 2 | ||
3 | The BCM2835 contains two forms of SPI master controller, one known simply as | 3 | The BCM2835 contains two forms of SPI master controller, one known simply as |
4 | SPI0, and the other known as the "Universal SPI Master"; part of the | 4 | SPI0, and the other known as the "Universal SPI Master"; part of the |
5 | auxilliary block. This binding applies to the SPI0 controller. | 5 | auxiliary block. This binding applies to the SPI0 controller. |
6 | 6 | ||
7 | Required properties: | 7 | Required properties: |
8 | - compatible: Should be "brcm,bcm2835-spi". | 8 | - compatible: Should be "brcm,bcm2835-spi". |
diff --git a/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt b/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt index cb47bfbcaeea..b5a86d20ee36 100644 --- a/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt +++ b/Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt | |||
@@ -44,7 +44,7 @@ Example 1: In this example, the system uses only the first global timer | |||
44 | }; | 44 | }; |
45 | 45 | ||
46 | Example 2: In this example, the MCT global and local timer interrupts are | 46 | Example 2: In this example, the MCT global and local timer interrupts are |
47 | connected to two seperate interrupt controllers. Hence, an | 47 | connected to two separate interrupt controllers. Hence, an |
48 | interrupt-map is created to map the interrupts to the respective | 48 | interrupt-map is created to map the interrupts to the respective |
49 | interrupt controllers. | 49 | interrupt controllers. |
50 | 50 | ||
diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt index ea840f7f9258..dc9dc8c87f15 100644 --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt | |||
@@ -12,7 +12,7 @@ AM33XX MUSB GLUE | |||
12 | represents PERIPHERAL. | 12 | represents PERIPHERAL. |
13 | - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2" | 13 | - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2" |
14 | represents PERIPHERAL. | 14 | represents PERIPHERAL. |
15 | - power : Should be "250". This signifies the controller can supply upto | 15 | - power : Should be "250". This signifies the controller can supply up to |
16 | 500mA when operating in host mode. | 16 | 500mA when operating in host mode. |
17 | 17 | ||
18 | Example: | 18 | Example: |
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt index d4769f343d6c..57e71f6817d0 100644 --- a/Documentation/devicetree/bindings/usb/omap-usb.txt +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt | |||
@@ -16,7 +16,7 @@ OMAP MUSB GLUE | |||
16 | specifying ULPI and UTMI respectively. | 16 | specifying ULPI and UTMI respectively. |
17 | - mode : Should be "3" to represent OTG. "1" signifies HOST and "2" | 17 | - mode : Should be "3" to represent OTG. "1" signifies HOST and "2" |
18 | represents PERIPHERAL. | 18 | represents PERIPHERAL. |
19 | - power : Should be "50". This signifies the controller can supply upto | 19 | - power : Should be "50". This signifies the controller can supply up to |
20 | 100mA when operating in host mode. | 20 | 100mA when operating in host mode. |
21 | - usb-phy : the phandle for the PHY device | 21 | - usb-phy : the phandle for the PHY device |
22 | 22 | ||
diff --git a/Documentation/dynamic-debug-howto.txt b/Documentation/dynamic-debug-howto.txt index 72322c6d7352..1bbdcfcf1f13 100644 --- a/Documentation/dynamic-debug-howto.txt +++ b/Documentation/dynamic-debug-howto.txt | |||
@@ -279,7 +279,7 @@ The dyndbg option is a "fake" module parameter, which means: | |||
279 | 279 | ||
280 | - modules do not need to define it explicitly | 280 | - modules do not need to define it explicitly |
281 | - every module gets it tacitly, whether they use pr_debug or not | 281 | - every module gets it tacitly, whether they use pr_debug or not |
282 | - it doesnt appear in /sys/module/$module/parameters/ | 282 | - it doesn't appear in /sys/module/$module/parameters/ |
283 | To see it, grep the control file, or inspect /proc/cmdline. | 283 | To see it, grep the control file, or inspect /proc/cmdline. |
284 | 284 | ||
285 | For CONFIG_DYNAMIC_DEBUG kernels, any settings given at boot-time (or | 285 | For CONFIG_DYNAMIC_DEBUG kernels, any settings given at boot-time (or |
diff --git a/Documentation/fb/cirrusfb.txt b/Documentation/fb/cirrusfb.txt index f9436843e998..f75950d330a4 100644 --- a/Documentation/fb/cirrusfb.txt +++ b/Documentation/fb/cirrusfb.txt | |||
@@ -55,7 +55,7 @@ Version 1.9.4.4 | |||
55 | * Overhaul color register routines. | 55 | * Overhaul color register routines. |
56 | * Associated with the above, console colors are now obtained from a LUT | 56 | * Associated with the above, console colors are now obtained from a LUT |
57 | called 'palette' instead of from the VGA registers. This code was | 57 | called 'palette' instead of from the VGA registers. This code was |
58 | modeled after that in atyfb and matroxfb. | 58 | modelled after that in atyfb and matroxfb. |
59 | * Code cleanup, add comments. | 59 | * Code cleanup, add comments. |
60 | * Overhaul SR07 handling. | 60 | * Overhaul SR07 handling. |
61 | * Bug fixes. | 61 | * Bug fixes. |
diff --git a/Documentation/filesystems/jfs.txt b/Documentation/filesystems/jfs.txt index f7433355394a..41fd757997b3 100644 --- a/Documentation/filesystems/jfs.txt +++ b/Documentation/filesystems/jfs.txt | |||
@@ -42,7 +42,7 @@ nodiscard(*) block device when blocks are freed. This is useful for SSD | |||
42 | devices and sparse/thinly-provisioned LUNs. The FITRIM ioctl | 42 | devices and sparse/thinly-provisioned LUNs. The FITRIM ioctl |
43 | command is also available together with the nodiscard option. | 43 | command is also available together with the nodiscard option. |
44 | The value of minlen specifies the minimum blockcount, when | 44 | The value of minlen specifies the minimum blockcount, when |
45 | a TRIM command to the block device is considered usefull. | 45 | a TRIM command to the block device is considered useful. |
46 | When no value is given to the discard option, it defaults to | 46 | When no value is given to the discard option, it defaults to |
47 | 64 blocks, which means 256KiB in JFS. | 47 | 64 blocks, which means 256KiB in JFS. |
48 | The minlen value of discard overrides the minlen value given | 48 | The minlen value of discard overrides the minlen value given |
diff --git a/Documentation/filesystems/qnx6.txt b/Documentation/filesystems/qnx6.txt index e59f2f09f56e..99e90184a72f 100644 --- a/Documentation/filesystems/qnx6.txt +++ b/Documentation/filesystems/qnx6.txt | |||
@@ -148,7 +148,7 @@ smaller than addressing space in the bitmap. | |||
148 | Bitmap system area | 148 | Bitmap system area |
149 | ------------------ | 149 | ------------------ |
150 | 150 | ||
151 | The bitmap itself is devided into three parts. | 151 | The bitmap itself is divided into three parts. |
152 | First the system area, that is split into two halfs. | 152 | First the system area, that is split into two halfs. |
153 | Then userspace. | 153 | Then userspace. |
154 | 154 | ||
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt index 4a93e98b290a..aa1f459fa6cf 100644 --- a/Documentation/filesystems/vfat.txt +++ b/Documentation/filesystems/vfat.txt | |||
@@ -307,7 +307,7 @@ the following: | |||
307 | 307 | ||
308 | <proceeding files...> | 308 | <proceeding files...> |
309 | <slot #3, id = 0x43, characters = "h is long"> | 309 | <slot #3, id = 0x43, characters = "h is long"> |
310 | <slot #2, id = 0x02, characters = "xtension whic"> | 310 | <slot #2, id = 0x02, characters = "xtension which"> |
311 | <slot #1, id = 0x01, characters = "My Big File.E"> | 311 | <slot #1, id = 0x01, characters = "My Big File.E"> |
312 | <directory entry, name = "MYBIGFIL.EXT"> | 312 | <directory entry, name = "MYBIGFIL.EXT"> |
313 | 313 | ||
diff --git a/Documentation/laptops/dslm.c b/Documentation/laptops/dslm.c index 72ff290c5fc6..d5dd2d4b04d8 100644 --- a/Documentation/laptops/dslm.c +++ b/Documentation/laptops/dslm.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * dslm.c | 2 | * dslm.c |
3 | * Simple Disk Sleep Monitor | 3 | * Simple Disk Sleep Monitor |
4 | * by Bartek Kania | 4 | * by Bartek Kania |
5 | * Licenced under the GPL | 5 | * Licensed under the GPL |
6 | */ | 6 | */ |
7 | #include <unistd.h> | 7 | #include <unistd.h> |
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt index 77bd0a42f19d..eeced24e56af 100644 --- a/Documentation/media-framework.txt +++ b/Documentation/media-framework.txt | |||
@@ -18,7 +18,7 @@ Abstract media device model | |||
18 | 18 | ||
19 | Discovering a device internal topology, and configuring it at runtime, is one | 19 | Discovering a device internal topology, and configuring it at runtime, is one |
20 | of the goals of the media framework. To achieve this, hardware devices are | 20 | of the goals of the media framework. To achieve this, hardware devices are |
21 | modeled as an oriented graph of building blocks called entities connected | 21 | modelled as an oriented graph of building blocks called entities connected |
22 | through pads. | 22 | through pads. |
23 | 23 | ||
24 | An entity is a basic media hardware building block. It can correspond to | 24 | An entity is a basic media hardware building block. It can correspond to |
diff --git a/Documentation/metag/kernel-ABI.txt b/Documentation/metag/kernel-ABI.txt index 7b8dee83b9c1..628216603198 100644 --- a/Documentation/metag/kernel-ABI.txt +++ b/Documentation/metag/kernel-ABI.txt | |||
@@ -189,7 +189,7 @@ call: | |||
189 | 189 | ||
190 | 64-bit arguments are placed in matching pairs of registers (i.e. the same | 190 | 64-bit arguments are placed in matching pairs of registers (i.e. the same |
191 | register number in both D0 and D1 units), with the least significant half in D0 | 191 | register number in both D0 and D1 units), with the least significant half in D0 |
192 | and the most significant half in D1, leaving a gap where necessary. Futher | 192 | and the most significant half in D1, leaving a gap where necessary. Further |
193 | arguments are stored on the stack in reverse order (earlier arguments at higher | 193 | arguments are stored on the stack in reverse order (earlier arguments at higher |
194 | addresses): | 194 | addresses): |
195 | 195 | ||
diff --git a/Documentation/misc-devices/mei/mei.txt b/Documentation/misc-devices/mei/mei.txt index 6ec702950719..15bba1aeba9a 100644 --- a/Documentation/misc-devices/mei/mei.txt +++ b/Documentation/misc-devices/mei/mei.txt | |||
@@ -120,7 +120,7 @@ The Intel MEI Driver supports the following IOCTL command: | |||
120 | Notes: | 120 | Notes: |
121 | max_msg_length (MTU) in client properties describes the maximum | 121 | max_msg_length (MTU) in client properties describes the maximum |
122 | data that can be sent or received. (e.g. if MTU=2K, can send | 122 | data that can be sent or received. (e.g. if MTU=2K, can send |
123 | requests up to bytes 2k and received responses upto 2k bytes). | 123 | requests up to bytes 2k and received responses up to 2k bytes). |
124 | 124 | ||
125 | Intel ME Applications: | 125 | Intel ME Applications: |
126 | ============== | 126 | ============== |
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index f98ca633b528..398d0fb1dd0e 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
@@ -183,7 +183,7 @@ tcp_early_retrans - INTEGER | |||
183 | for triggering fast retransmit when the amount of outstanding data is | 183 | for triggering fast retransmit when the amount of outstanding data is |
184 | small and when no previously unsent data can be transmitted (such | 184 | small and when no previously unsent data can be transmitted (such |
185 | that limited transmit could be used). Also controls the use of | 185 | that limited transmit could be used). Also controls the use of |
186 | Tail loss probe (TLP) that converts RTOs occuring due to tail | 186 | Tail loss probe (TLP) that converts RTOs occurring due to tail |
187 | losses into fast recovery (draft-dukkipati-tcpm-tcp-loss-probe-01). | 187 | losses into fast recovery (draft-dukkipati-tcpm-tcp-loss-probe-01). |
188 | Possible values: | 188 | Possible values: |
189 | 0 disables ER | 189 | 0 disables ER |
diff --git a/Documentation/networking/netlink_mmap.txt b/Documentation/networking/netlink_mmap.txt index 1c2dab409625..9bd0f5211e9a 100644 --- a/Documentation/networking/netlink_mmap.txt +++ b/Documentation/networking/netlink_mmap.txt | |||
@@ -54,7 +54,7 @@ it will use an allocated socket buffer as usual and the contents will be | |||
54 | copied to the ring on transmission, nullifying most of the performance gains. | 54 | copied to the ring on transmission, nullifying most of the performance gains. |
55 | Dumps of kernel databases automatically support memory mapped I/O. | 55 | Dumps of kernel databases automatically support memory mapped I/O. |
56 | 56 | ||
57 | Conversion of the transmit path involves changing message contruction to | 57 | Conversion of the transmit path involves changing message construction to |
58 | use memory from the TX ring instead of (usually) a buffer declared on the | 58 | use memory from the TX ring instead of (usually) a buffer declared on the |
59 | stack and setting up the frame header approriately. Optionally poll() can | 59 | stack and setting up the frame header approriately. Optionally poll() can |
60 | be used to wait for free frames in the TX ring. | 60 | be used to wait for free frames in the TX ring. |
@@ -65,8 +65,8 @@ Structured and definitions for using memory mapped I/O are contained in | |||
65 | RX and TX rings | 65 | RX and TX rings |
66 | ---------------- | 66 | ---------------- |
67 | 67 | ||
68 | Each ring contains a number of continous memory blocks, containing frames of | 68 | Each ring contains a number of continuous memory blocks, containing frames of |
69 | fixed size dependant on the parameters used for ring setup. | 69 | fixed size dependent on the parameters used for ring setup. |
70 | 70 | ||
71 | Ring: [ block 0 ] | 71 | Ring: [ block 0 ] |
72 | [ frame 0 ] | 72 | [ frame 0 ] |
@@ -80,7 +80,7 @@ Ring: [ block 0 ] | |||
80 | [ frame 2 * n + 1 ] | 80 | [ frame 2 * n + 1 ] |
81 | 81 | ||
82 | The blocks are only visible to the kernel, from the point of view of user-space | 82 | The blocks are only visible to the kernel, from the point of view of user-space |
83 | the ring just contains the frames in a continous memory zone. | 83 | the ring just contains the frames in a continuous memory zone. |
84 | 84 | ||
85 | The ring parameters used for setting up the ring are defined as follows: | 85 | The ring parameters used for setting up the ring are defined as follows: |
86 | 86 | ||
@@ -91,7 +91,7 @@ struct nl_mmap_req { | |||
91 | unsigned int nm_frame_nr; | 91 | unsigned int nm_frame_nr; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | Frames are grouped into blocks, where each block is a continous region of memory | 94 | Frames are grouped into blocks, where each block is a continuous region of memory |
95 | and holds nm_block_size / nm_frame_size frames. The total number of frames in | 95 | and holds nm_block_size / nm_frame_size frames. The total number of frames in |
96 | the ring is nm_frame_nr. The following invariants hold: | 96 | the ring is nm_frame_nr. The following invariants hold: |
97 | 97 | ||
@@ -113,7 +113,7 @@ Some parameters are constrained, specifically: | |||
113 | 113 | ||
114 | - nm_frame_nr must equal the actual number of frames as specified above. | 114 | - nm_frame_nr must equal the actual number of frames as specified above. |
115 | 115 | ||
116 | When the kernel can't allocate phsyically continous memory for a ring block, | 116 | When the kernel can't allocate physically continuous memory for a ring block, |
117 | it will fall back to use physically discontinous memory. This might affect | 117 | it will fall back to use physically discontinous memory. This might affect |
118 | performance negatively, in order to avoid this the nm_frame_size parameter | 118 | performance negatively, in order to avoid this the nm_frame_size parameter |
119 | should be chosen to be as small as possible for the required frame size and | 119 | should be chosen to be as small as possible for the required frame size and |
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index 447fd4cd54ec..d3c6d3dd7d4d 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt | |||
@@ -298,7 +298,7 @@ Since the pin controller subsystem have its pinspace local to the pin | |||
298 | controller we need a mapping so that the pin control subsystem can figure out | 298 | controller we need a mapping so that the pin control subsystem can figure out |
299 | which pin controller handles control of a certain GPIO pin. Since a single | 299 | which pin controller handles control of a certain GPIO pin. Since a single |
300 | pin controller may be muxing several GPIO ranges (typically SoCs that have | 300 | pin controller may be muxing several GPIO ranges (typically SoCs that have |
301 | one set of pins but internally several GPIO silicon blocks, each modeled as | 301 | one set of pins but internally several GPIO silicon blocks, each modelled as |
302 | a struct gpio_chip) any number of GPIO ranges can be added to a pin controller | 302 | a struct gpio_chip) any number of GPIO ranges can be added to a pin controller |
303 | instance like this: | 303 | instance like this: |
304 | 304 | ||
diff --git a/Documentation/thermal/exynos_thermal_emulation b/Documentation/thermal/exynos_thermal_emulation index 36a3e79c1203..b15efec6ca28 100644 --- a/Documentation/thermal/exynos_thermal_emulation +++ b/Documentation/thermal/exynos_thermal_emulation | |||
@@ -20,7 +20,7 @@ When it's enabled, sysfs node will be created as | |||
20 | The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any | 20 | The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any |
21 | temperature you want to update to sysfs node, it automatically enable emulation mode and | 21 | temperature you want to update to sysfs node, it automatically enable emulation mode and |
22 | current temperature will be changed into it. | 22 | current temperature will be changed into it. |
23 | (Exynos also supports user changable delay time which would be used to delay of | 23 | (Exynos also supports user changeable delay time which would be used to delay of |
24 | changing temperature. However, this node only uses same delay of real sensing time, 938us.) | 24 | changing temperature. However, this node only uses same delay of real sensing time, 938us.) |
25 | 25 | ||
26 | Exynos emulation mode requires synchronous of value changing and enabling. It means when you | 26 | Exynos emulation mode requires synchronous of value changing and enabling. It means when you |
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 5f91eda91647..c2db6e3fb459 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt | |||
@@ -1683,7 +1683,7 @@ The parameter is defined like this: | |||
1683 | 1683 | ||
1684 | This ioctl maps the memory at "user_addr" with the length "length" to | 1684 | This ioctl maps the memory at "user_addr" with the length "length" to |
1685 | the vcpu's address space starting at "vcpu_addr". All parameters need to | 1685 | the vcpu's address space starting at "vcpu_addr". All parameters need to |
1686 | be alligned by 1 megabyte. | 1686 | be aligned by 1 megabyte. |
1687 | 1687 | ||
1688 | 1688 | ||
1689 | 4.66 KVM_S390_UCAS_UNMAP | 1689 | 4.66 KVM_S390_UCAS_UNMAP |
@@ -1703,7 +1703,7 @@ The parameter is defined like this: | |||
1703 | 1703 | ||
1704 | This ioctl unmaps the memory in the vcpu's address space starting at | 1704 | This ioctl unmaps the memory in the vcpu's address space starting at |
1705 | "vcpu_addr" with the length "length". The field "user_addr" is ignored. | 1705 | "vcpu_addr" with the length "length". The field "user_addr" is ignored. |
1706 | All parameters need to be alligned by 1 megabyte. | 1706 | All parameters need to be aligned by 1 megabyte. |
1707 | 1707 | ||
1708 | 1708 | ||
1709 | 4.67 KVM_S390_VCPU_FAULT | 1709 | 4.67 KVM_S390_VCPU_FAULT |
@@ -2019,7 +2019,7 @@ be OR'ed into the "vsid" argument of the slbmte instruction. | |||
2019 | The "enc" array is a list which for each of those segment base page | 2019 | The "enc" array is a list which for each of those segment base page |
2020 | size provides the list of supported actual page sizes (which can be | 2020 | size provides the list of supported actual page sizes (which can be |
2021 | only larger or equal to the base page size), along with the | 2021 | only larger or equal to the base page size), along with the |
2022 | corresponding encoding in the hash PTE. Similarily, the array is | 2022 | corresponding encoding in the hash PTE. Similarly, the array is |
2023 | 8 entries sorted by increasing sizes and an entry with a "0" shift | 2023 | 8 entries sorted by increasing sizes and an entry with a "0" shift |
2024 | is an empty entry and a terminator: | 2024 | is an empty entry and a terminator: |
2025 | 2025 | ||
diff --git a/Documentation/vm/pagemap.txt b/Documentation/vm/pagemap.txt index 7587493c67f1..5ef3dd38bb64 100644 --- a/Documentation/vm/pagemap.txt +++ b/Documentation/vm/pagemap.txt | |||
@@ -147,5 +147,5 @@ once. | |||
147 | Other notes: | 147 | Other notes: |
148 | 148 | ||
149 | Reading from any of the files will return -EINVAL if you are not starting | 149 | Reading from any of the files will return -EINVAL if you are not starting |
150 | the read on an 8-byte boundary (e.g., if you seeked an odd number of bytes | 150 | the read on an 8-byte boundary (e.g., if you sought an odd number of bytes |
151 | into the file), or if the size of the read is not a multiple of 8 bytes. | 151 | into the file), or if the size of the read is not a multiple of 8 bytes. |
diff --git a/Documentation/w1/slaves/w1_ds28e04 b/Documentation/w1/slaves/w1_ds28e04 index 85bc9a7e02fe..7819b65cfa48 100644 --- a/Documentation/w1/slaves/w1_ds28e04 +++ b/Documentation/w1/slaves/w1_ds28e04 | |||
@@ -24,7 +24,7 @@ Memory Access | |||
24 | 24 | ||
25 | A write operation on the "eeprom" file writes the given byte sequence | 25 | A write operation on the "eeprom" file writes the given byte sequence |
26 | to the EEPROM of the DS28E04. If CRC checking mode is enabled only | 26 | to the EEPROM of the DS28E04. If CRC checking mode is enabled only |
27 | fully alligned blocks of 32 bytes with valid CRC16 values (in bytes 30 | 27 | fully aligned blocks of 32 bytes with valid CRC16 values (in bytes 30 |
28 | and 31) are allowed to be written. | 28 | and 31) are allowed to be written. |
29 | 29 | ||
30 | PIO Access | 30 | PIO Access |