diff options
92 files changed, 125 insertions, 135 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-net b/Documentation/ABI/testing/sysfs-class-net index d322b0581194..e1b2e785bba8 100644 --- a/Documentation/ABI/testing/sysfs-class-net +++ b/Documentation/ABI/testing/sysfs-class-net | |||
@@ -159,7 +159,7 @@ Description: | |||
159 | lower-level interface protocol used. Ethernet devices will show | 159 | lower-level interface protocol used. Ethernet devices will show |
160 | a 'mtu' attribute value of 1500 unless changed. | 160 | a 'mtu' attribute value of 1500 unless changed. |
161 | 161 | ||
162 | What: /sys/calss/net/<iface>/netdev_group | 162 | What: /sys/class/net/<iface>/netdev_group |
163 | Date: January 2011 | 163 | Date: January 2011 |
164 | KernelVersion: 2.6.39 | 164 | KernelVersion: 2.6.39 |
165 | Contact: netdev@vger.kernel.org | 165 | Contact: netdev@vger.kernel.org |
diff --git a/Documentation/Changes b/Documentation/Changes index 227bec88021e..1de131bb49fb 100644 --- a/Documentation/Changes +++ b/Documentation/Changes | |||
@@ -167,18 +167,11 @@ later is recommended, due to some significant improvements). | |||
167 | PCMCIAutils | 167 | PCMCIAutils |
168 | ----------- | 168 | ----------- |
169 | 169 | ||
170 | PCMCIAutils replaces pcmcia-cs (see below). It properly sets up | 170 | PCMCIAutils replaces pcmcia-cs. It properly sets up |
171 | PCMCIA sockets at system startup and loads the appropriate modules | 171 | PCMCIA sockets at system startup and loads the appropriate modules |
172 | for 16-bit PCMCIA devices if the kernel is modularized and the hotplug | 172 | for 16-bit PCMCIA devices if the kernel is modularized and the hotplug |
173 | subsystem is used. | 173 | subsystem is used. |
174 | 174 | ||
175 | Pcmcia-cs | ||
176 | --------- | ||
177 | |||
178 | PCMCIA (PC Card) support is now partially implemented in the main | ||
179 | kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs | ||
180 | for newest kernels. | ||
181 | |||
182 | Quota-tools | 175 | Quota-tools |
183 | ----------- | 176 | ----------- |
184 | 177 | ||
@@ -341,17 +334,13 @@ Pcmciautils | |||
341 | ----------- | 334 | ----------- |
342 | o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/> | 335 | o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/> |
343 | 336 | ||
344 | Pcmcia-cs | ||
345 | --------- | ||
346 | o <http://pcmcia-cs.sourceforge.net/> | ||
347 | |||
348 | Quota-tools | 337 | Quota-tools |
349 | ---------- | 338 | ---------- |
350 | o <http://sourceforge.net/projects/linuxquota/> | 339 | o <http://sourceforge.net/projects/linuxquota/> |
351 | 340 | ||
352 | DocBook Stylesheets | 341 | DocBook Stylesheets |
353 | ------------------- | 342 | ------------------- |
354 | o <http://nwalsh.com/docbook/dsssl/> | 343 | o <http://sourceforge.net/projects/docbook/files/docbook-dsssl/> |
355 | 344 | ||
356 | XMLTO XSLT Frontend | 345 | XMLTO XSLT Frontend |
357 | ------------------- | 346 | ------------------- |
@@ -359,11 +348,11 @@ o <http://cyberelk.net/tim/xmlto/> | |||
359 | 348 | ||
360 | Intel P6 microcode | 349 | Intel P6 microcode |
361 | ------------------ | 350 | ------------------ |
362 | o <http://www.urbanmyth.org/microcode/> | 351 | o <https://downloadcenter.intel.com/> |
363 | 352 | ||
364 | udev | 353 | udev |
365 | ---- | 354 | ---- |
366 | o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html> | 355 | o <http://www.freedesktop.org/software/systemd/man/udev.html> |
367 | 356 | ||
368 | FUSE | 357 | FUSE |
369 | ---- | 358 | ---- |
@@ -371,7 +360,7 @@ o <http://sourceforge.net/projects/fuse> | |||
371 | 360 | ||
372 | mcelog | 361 | mcelog |
373 | ------ | 362 | ------ |
374 | o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/> | 363 | o <http://www.mcelog.org/> |
375 | 364 | ||
376 | Networking | 365 | Networking |
377 | ********** | 366 | ********** |
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 6b6bef31e956..3171822c22a5 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
@@ -675,7 +675,7 @@ the ones already enabled by DEBUG. | |||
675 | Many subsystems have Kconfig debug options to turn on -DDEBUG in the | 675 | Many subsystems have Kconfig debug options to turn on -DDEBUG in the |
676 | corresponding Makefile; in other cases specific files #define DEBUG. And | 676 | corresponding Makefile; in other cases specific files #define DEBUG. And |
677 | when a debug message should be unconditionally printed, such as if it is | 677 | when a debug message should be unconditionally printed, such as if it is |
678 | already inside a debug-related #ifdef secton, printk(KERN_DEBUG ...) can be | 678 | already inside a debug-related #ifdef section, printk(KERN_DEBUG ...) can be |
679 | used. | 679 | used. |
680 | 680 | ||
681 | 681 | ||
diff --git a/Documentation/applying-patches.txt b/Documentation/applying-patches.txt index a083ba35d1ad..77df55b0225a 100644 --- a/Documentation/applying-patches.txt +++ b/Documentation/applying-patches.txt | |||
@@ -94,7 +94,7 @@ Common errors when patching | |||
94 | --- | 94 | --- |
95 | When patch applies a patch file it attempts to verify the sanity of the | 95 | When patch applies a patch file it attempts to verify the sanity of the |
96 | file in different ways. | 96 | file in different ways. |
97 | Checking that the file looks like a valid patch file & checking the code | 97 | Checking that the file looks like a valid patch file and checking the code |
98 | around the bits being modified matches the context provided in the patch are | 98 | around the bits being modified matches the context provided in the patch are |
99 | just two of the basic sanity checks patch does. | 99 | just two of the basic sanity checks patch does. |
100 | 100 | ||
diff --git a/Documentation/block/null_blk.txt b/Documentation/block/null_blk.txt index b2830b435895..2f6c6ff7161d 100644 --- a/Documentation/block/null_blk.txt +++ b/Documentation/block/null_blk.txt | |||
@@ -42,7 +42,7 @@ nr_devices=[Number of devices]: Default: 2 | |||
42 | Number of block devices instantiated. They are instantiated as /dev/nullb0, | 42 | Number of block devices instantiated. They are instantiated as /dev/nullb0, |
43 | etc. | 43 | etc. |
44 | 44 | ||
45 | irq_mode=[0-2]: Default: 1-Soft-irq | 45 | irqmode=[0-2]: Default: 1-Soft-irq |
46 | The completion mode used for completing IOs to the block-layer. | 46 | The completion mode used for completing IOs to the block-layer. |
47 | 47 | ||
48 | 0: None. | 48 | 0: None. |
@@ -53,7 +53,7 @@ irq_mode=[0-2]: Default: 1-Soft-irq | |||
53 | completion. | 53 | completion. |
54 | 54 | ||
55 | completion_nsec=[ns]: Default: 10.000ns | 55 | completion_nsec=[ns]: Default: 10.000ns |
56 | Combined with irq_mode=2 (timer). The time each completion event must wait. | 56 | Combined with irqmode=2 (timer). The time each completion event must wait. |
57 | 57 | ||
58 | submit_queues=[0..nr_cpus]: | 58 | submit_queues=[0..nr_cpus]: |
59 | The number of submission queues attached to the device driver. If unset, it | 59 | The number of submission queues attached to the device driver. If unset, it |
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt index 7d2d046c265f..3a29f8914df9 100644 --- a/Documentation/block/queue-sysfs.txt +++ b/Documentation/block/queue-sysfs.txt | |||
@@ -11,7 +11,7 @@ read-write. | |||
11 | 11 | ||
12 | add_random (RW) | 12 | add_random (RW) |
13 | ---------------- | 13 | ---------------- |
14 | This file allows to trun off the disk entropy contribution. Default | 14 | This file allows to turn off the disk entropy contribution. Default |
15 | value of this file is '1'(on). | 15 | value of this file is '1'(on). |
16 | 16 | ||
17 | discard_granularity (RO) | 17 | discard_granularity (RO) |
@@ -72,7 +72,7 @@ Maximum segment size of the device. | |||
72 | 72 | ||
73 | minimum_io_size (RO) | 73 | minimum_io_size (RO) |
74 | -------------------- | 74 | -------------------- |
75 | This is the smallest preferred io size reported by the device. | 75 | This is the smallest preferred IO size reported by the device. |
76 | 76 | ||
77 | nomerges (RW) | 77 | nomerges (RW) |
78 | ------------- | 78 | ------------- |
@@ -98,7 +98,7 @@ regulated by nr_requests. | |||
98 | 98 | ||
99 | optimal_io_size (RO) | 99 | optimal_io_size (RO) |
100 | -------------------- | 100 | -------------------- |
101 | This is the optimal io size reported by the device. | 101 | This is the optimal IO size reported by the device. |
102 | 102 | ||
103 | physical_block_size (RO) | 103 | physical_block_size (RO) |
104 | ------------------------ | 104 | ------------------------ |
diff --git a/Documentation/devicetree/bindings/clock/arm-integrator.txt b/Documentation/devicetree/bindings/clock/arm-integrator.txt index ecc69520bcea..11f5f95f571b 100644 --- a/Documentation/devicetree/bindings/clock/arm-integrator.txt +++ b/Documentation/devicetree/bindings/clock/arm-integrator.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | Clock bindings for ARM Integrator and Versatile Core Module clocks | 1 | Clock bindings for ARM Integrator and Versatile Core Module clocks |
2 | 2 | ||
3 | Auxilary Oscillator Clock | 3 | Auxiliary Oscillator Clock |
4 | 4 | ||
5 | This is a configurable clock fed from a 24 MHz chrystal, | 5 | This is a configurable clock fed from a 24 MHz chrystal, |
6 | used for generating e.g. video clocks. It is located on the | 6 | used for generating e.g. video clocks. It is located on the |
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt index c0a20cd972e3..baf8a3c1b469 100644 --- a/Documentation/devicetree/bindings/crypto/fsl-sec6.txt +++ b/Documentation/devicetree/bindings/crypto/fsl-sec6.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM). | 1 | SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM). |
2 | Currently Freescale powerpc chip C29X is embeded with SEC 6. | 2 | Currently Freescale powerpc chip C29X is embedded with SEC 6. |
3 | SEC 6 device tree binding include: | 3 | SEC 6 device tree binding include: |
4 | -SEC 6 Node | 4 | -SEC 6 Node |
5 | -Job Ring Node | 5 | -Job Ring Node |
diff --git a/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt b/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt index dcebff1928e1..1a4a43d5c9ea 100644 --- a/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt +++ b/Documentation/devicetree/bindings/iio/adc/vf610-adc.txt | |||
@@ -9,7 +9,7 @@ Required properties: | |||
9 | - interrupts: Should contain the interrupt for the device | 9 | - interrupts: Should contain the interrupt for the device |
10 | - clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock. | 10 | - clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock. |
11 | - clock-names: Must contain "adc", matching entry in the clocks property. | 11 | - clock-names: Must contain "adc", matching entry in the clocks property. |
12 | - vref-supply: The regulator supply ADC refrence voltage. | 12 | - vref-supply: The regulator supply ADC reference voltage. |
13 | 13 | ||
14 | Example: | 14 | Example: |
15 | adc0: adc@4003b000 { | 15 | adc0: adc@4003b000 { |
diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt index ba2d7f0f9c5f..0e4026a6cbbf 100644 --- a/Documentation/devicetree/bindings/mfd/s2mps11.txt +++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt | |||
@@ -47,7 +47,7 @@ sub-node should be of the format as listed below. | |||
47 | 47 | ||
48 | regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us | 48 | regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us |
49 | 49 | ||
50 | BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explictly | 50 | BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explicitly |
51 | regulator-ramp-delay = <0> can be used for them to disable ramp delay. | 51 | regulator-ramp-delay = <0> can be used for them to disable ramp delay. |
52 | In the absence of the regulator-ramp-delay property, the default ramp | 52 | In the absence of the regulator-ramp-delay property, the default ramp |
53 | delay will be used. | 53 | delay will be used. |
diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt index ee654e95d8ad..fb733c4e1c11 100644 --- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt +++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt | |||
@@ -110,8 +110,8 @@ on various other factors also like; | |||
110 | Other factor which governs the selection of ecc-scheme is oob-size. | 110 | Other factor which governs the selection of ecc-scheme is oob-size. |
111 | Higher ECC schemes require more OOB/Spare area to store ECC syndrome, | 111 | Higher ECC schemes require more OOB/Spare area to store ECC syndrome, |
112 | so the device should have enough free bytes available its OOB/Spare | 112 | so the device should have enough free bytes available its OOB/Spare |
113 | area to accomodate ECC for entire page. In general following expression | 113 | area to accommodate ECC for entire page. In general following expression |
114 | helps in determining if given device can accomodate ECC syndrome: | 114 | helps in determining if given device can accommodate ECC syndrome: |
115 | "2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE" | 115 | "2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE" |
116 | where | 116 | where |
117 | OOBSIZE number of bytes in OOB/spare area | 117 | OOBSIZE number of bytes in OOB/spare area |
@@ -133,5 +133,5 @@ on various other factors also like; | |||
133 | Example(b): For a device with PAGESIZE = 2048 and OOBSIZE = 128 and | 133 | Example(b): For a device with PAGESIZE = 2048 and OOBSIZE = 128 and |
134 | trying to use BCH16 (ECC_BYTES=26) ecc-scheme. | 134 | trying to use BCH16 (ECC_BYTES=26) ecc-scheme. |
135 | Number of ECC bytes per page = (2 + (2048 / 512) * 26) = 106 B | 135 | Number of ECC bytes per page = (2 + (2048 / 512) * 26) = 106 B |
136 | which can be accomodate in the OOB/Spare area of this device | 136 | which can be accommodated in the OOB/Spare area of this device |
137 | (OOBSIZE=128). So this device can use BCH16 ecc-scheme. | 137 | (OOBSIZE=128). So this device can use BCH16 ecc-scheme. |
diff --git a/Documentation/devicetree/bindings/net/samsung-sxgbe.txt b/Documentation/devicetree/bindings/net/samsung-sxgbe.txt index 989f6c95cfd5..888c250197fe 100644 --- a/Documentation/devicetree/bindings/net/samsung-sxgbe.txt +++ b/Documentation/devicetree/bindings/net/samsung-sxgbe.txt | |||
@@ -17,7 +17,7 @@ Required properties: | |||
17 | - samsung,pbl: Integer, Programmable Burst Length. | 17 | - samsung,pbl: Integer, Programmable Burst Length. |
18 | Supported values are 1, 2, 4, 8, 16, or 32. | 18 | Supported values are 1, 2, 4, 8, 16, or 32. |
19 | - samsung,burst-map: Integer, Program the possible bursts supported by sxgbe | 19 | - samsung,burst-map: Integer, Program the possible bursts supported by sxgbe |
20 | This is an interger and represents allowable DMA bursts when fixed burst. | 20 | This is an integer and represents allowable DMA bursts when fixed burst. |
21 | Allowable range is 0x01-0x3F. When this field is set fixed burst is enabled. | 21 | Allowable range is 0x01-0x3F. When this field is set fixed burst is enabled. |
22 | When fixed length is needed for burst mode, it can be set within allowable | 22 | When fixed length is needed for burst mode, it can be set within allowable |
23 | range. | 23 | range. |
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index e45ac3f926b1..c41afd963edf 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt | |||
@@ -58,5 +58,5 @@ Examples: | |||
58 | snps,multicast-filter-bins = <256>; | 58 | snps,multicast-filter-bins = <256>; |
59 | snps,perfect-filter-entries = <128>; | 59 | snps,perfect-filter-entries = <128>; |
60 | clocks = <&clock>; | 60 | clocks = <&clock>; |
61 | clock-names = "stmmaceth">; | 61 | clock-names = "stmmaceth"; |
62 | }; | 62 | }; |
diff --git a/Documentation/devicetree/bindings/pci/host-generic-pci.txt b/Documentation/devicetree/bindings/pci/host-generic-pci.txt index f0b0436807b4..cf3e205e0b7e 100644 --- a/Documentation/devicetree/bindings/pci/host-generic-pci.txt +++ b/Documentation/devicetree/bindings/pci/host-generic-pci.txt | |||
@@ -55,7 +55,7 @@ For CAM, this 24-bit offset is: | |||
55 | cfg_offset(bus, device, function, register) = | 55 | cfg_offset(bus, device, function, register) = |
56 | bus << 16 | device << 11 | function << 8 | register | 56 | bus << 16 | device << 11 | function << 8 | register |
57 | 57 | ||
58 | Whilst ECAM extends this by 4 bits to accomodate 4k of function space: | 58 | Whilst ECAM extends this by 4 bits to accommodate 4k of function space: |
59 | 59 | ||
60 | cfg_offset(bus, device, function, register) = | 60 | cfg_offset(bus, device, function, register) = |
61 | bus << 20 | device << 15 | function << 12 | register | 61 | bus << 20 | device << 15 | function << 12 | register |
diff --git a/Documentation/devicetree/bindings/phy/phy-bindings.txt b/Documentation/devicetree/bindings/phy/phy-bindings.txt index 2aa1840200ed..1293c321754c 100644 --- a/Documentation/devicetree/bindings/phy/phy-bindings.txt +++ b/Documentation/devicetree/bindings/phy/phy-bindings.txt | |||
@@ -27,7 +27,7 @@ phys: phy { | |||
27 | }; | 27 | }; |
28 | 28 | ||
29 | That node describes an IP block (PHY provider) that implements 2 different PHYs. | 29 | That node describes an IP block (PHY provider) that implements 2 different PHYs. |
30 | In order to differentiate between these 2 PHYs, an additonal specifier should be | 30 | In order to differentiate between these 2 PHYs, an additional specifier should be |
31 | given while trying to get a reference to it. | 31 | given while trying to get a reference to it. |
32 | 32 | ||
33 | PHY user node | 33 | PHY user node |
diff --git a/Documentation/devicetree/bindings/power_supply/charger-manager.txt b/Documentation/devicetree/bindings/power_supply/charger-manager.txt index 2b33750e3db2..ec4fe9de3137 100644 --- a/Documentation/devicetree/bindings/power_supply/charger-manager.txt +++ b/Documentation/devicetree/bindings/power_supply/charger-manager.txt | |||
@@ -24,7 +24,7 @@ Optional properties : | |||
24 | - cm-thermal-zone : name of external thermometer's thermal zone | 24 | - cm-thermal-zone : name of external thermometer's thermal zone |
25 | - cm-battery-* : threshold battery temperature for charging | 25 | - cm-battery-* : threshold battery temperature for charging |
26 | -cold : critical cold temperature of battery for charging | 26 | -cold : critical cold temperature of battery for charging |
27 | -cold-in-minus : flag that cold temerature is in minus degree | 27 | -cold-in-minus : flag that cold temperature is in minus degrees |
28 | -hot : critical hot temperature of battery for charging | 28 | -hot : critical hot temperature of battery for charging |
29 | -temp-diff : temperature difference to allow recharging | 29 | -temp-diff : temperature difference to allow recharging |
30 | - cm-dis/charging-max = limits of charging duration | 30 | - cm-dis/charging-max = limits of charging duration |
diff --git a/Documentation/devicetree/bindings/sound/st,sta350.txt b/Documentation/devicetree/bindings/sound/st,sta350.txt index b7e71bf5caf4..307398ef2317 100644 --- a/Documentation/devicetree/bindings/sound/st,sta350.txt +++ b/Documentation/devicetree/bindings/sound/st,sta350.txt | |||
@@ -33,7 +33,7 @@ Optional properties: | |||
33 | 0: Channel 1 | 33 | 0: Channel 1 |
34 | 1: Channel 2 | 34 | 1: Channel 2 |
35 | 2: Channel 3 | 35 | 2: Channel 3 |
36 | If parameter is missing, channel 1 is choosen. | 36 | If parameter is missing, channel 1 is chosen. |
37 | This properties have to be specified as '/bits/ 8' values. | 37 | This properties have to be specified as '/bits/ 8' values. |
38 | 38 | ||
39 | - st,thermal-warning-recover: | 39 | - st,thermal-warning-recover: |
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 6073e76575ea..252e4e4c122a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
@@ -140,7 +140,7 @@ tlm Trusted Logic Mobility | |||
140 | toradex Toradex AG | 140 | toradex Toradex AG |
141 | toshiba Toshiba Corporation | 141 | toshiba Toshiba Corporation |
142 | toumaz Toumaz | 142 | toumaz Toumaz |
143 | usi Universal Scientifc Industrial Co., Ltd. | 143 | usi Universal Scientific Industrial Co., Ltd. |
144 | v3 V3 Semiconductor | 144 | v3 V3 Semiconductor |
145 | variscite Variscite Ltd. | 145 | variscite Variscite Ltd. |
146 | via VIA Technologies, Inc. | 146 | via VIA Technologies, Inc. |
diff --git a/Documentation/devicetree/bindings/video/atmel,lcdc.txt b/Documentation/devicetree/bindings/video/atmel,lcdc.txt index b75af94a5e52..7d0c4a1ab811 100644 --- a/Documentation/devicetree/bindings/video/atmel,lcdc.txt +++ b/Documentation/devicetree/bindings/video/atmel,lcdc.txt | |||
@@ -39,8 +39,8 @@ Atmel LCDC Display | |||
39 | ----------------------------------------------------- | 39 | ----------------------------------------------------- |
40 | Required properties (as per of_videomode_helper): | 40 | Required properties (as per of_videomode_helper): |
41 | 41 | ||
42 | - atmel,dmacon: dma controler configuration | 42 | - atmel,dmacon: dma controller configuration |
43 | - atmel,lcdcon2: lcd controler configuration | 43 | - atmel,lcdcon2: lcd controller configuration |
44 | - atmel,guard-time: lcd guard time (Delay in frame periods) | 44 | - atmel,guard-time: lcd guard time (Delay in frame periods) |
45 | - bits-per-pixel: lcd panel bit-depth. | 45 | - bits-per-pixel: lcd panel bit-depth. |
46 | 46 | ||
diff --git a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt index 0329f60d431e..8c8c2f4e4c3f 100644 --- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt +++ b/Documentation/devicetree/bindings/video/fsl,imx-fb.txt | |||
@@ -20,7 +20,7 @@ Optional properties: | |||
20 | register is not modified as recommended by the datasheet. | 20 | register is not modified as recommended by the datasheet. |
21 | - fsl,lpccr: Contrast Control Register value. This property provides the | 21 | - fsl,lpccr: Contrast Control Register value. This property provides the |
22 | default value for the contrast control register. | 22 | default value for the contrast control register. |
23 | If that property is ommited, the register is zeroed. | 23 | If that property is omitted, the register is zeroed. |
24 | - fsl,lscr1: LCDC Sharp Configuration Register value. | 24 | - fsl,lscr1: LCDC Sharp Configuration Register value. |
25 | 25 | ||
26 | Example: | 26 | Example: |
diff --git a/Documentation/kmemleak.txt b/Documentation/kmemleak.txt index b772418bf064..f4f033c8d856 100644 --- a/Documentation/kmemleak.txt +++ b/Documentation/kmemleak.txt | |||
@@ -122,7 +122,7 @@ Then as usual to get your report with: | |||
122 | Freeing kmemleak internal objects | 122 | Freeing kmemleak internal objects |
123 | --------------------------------- | 123 | --------------------------------- |
124 | 124 | ||
125 | To allow access to previosuly found memory leaks after kmemleak has been | 125 | To allow access to previously found memory leaks after kmemleak has been |
126 | disabled by the user or due to an fatal error, internal kmemleak objects | 126 | disabled by the user or due to an fatal error, internal kmemleak objects |
127 | won't be freed when kmemleak is disabled, and those objects may occupy | 127 | won't be freed when kmemleak is disabled, and those objects may occupy |
128 | a large part of physical memory. | 128 | a large part of physical memory. |
diff --git a/Documentation/lockup-watchdogs.txt b/Documentation/lockup-watchdogs.txt index d2a36602ca8d..ab0baa692c13 100644 --- a/Documentation/lockup-watchdogs.txt +++ b/Documentation/lockup-watchdogs.txt | |||
@@ -12,7 +12,7 @@ stack trace is displayed upon detection and, by default, the system | |||
12 | will stay locked up. Alternatively, the kernel can be configured to | 12 | will stay locked up. Alternatively, the kernel can be configured to |
13 | panic; a sysctl, "kernel.softlockup_panic", a kernel parameter, | 13 | panic; a sysctl, "kernel.softlockup_panic", a kernel parameter, |
14 | "softlockup_panic" (see "Documentation/kernel-parameters.txt" for | 14 | "softlockup_panic" (see "Documentation/kernel-parameters.txt" for |
15 | details), and a compile option, "BOOTPARAM_HARDLOCKUP_PANIC", are | 15 | details), and a compile option, "BOOTPARAM_SOFTLOCKUP_PANIC", are |
16 | provided for this. | 16 | provided for this. |
17 | 17 | ||
18 | A 'hardlockup' is defined as a bug that causes the CPU to loop in | 18 | A 'hardlockup' is defined as a bug that causes the CPU to loop in |
diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README index cc887ecfd6eb..52844a58cc8a 100644 --- a/Documentation/mips/AU1xxx_IDE.README +++ b/Documentation/mips/AU1xxx_IDE.README | |||
@@ -2,7 +2,7 @@ README for MIPS AU1XXX IDE driver - Released 2005-07-15 | |||
2 | 2 | ||
3 | ABOUT | 3 | ABOUT |
4 | ----- | 4 | ----- |
5 | This file describes the 'drivers/ide/mips/au1xxx-ide.c', related files and the | 5 | This file describes the 'drivers/ide/au1xxx-ide.c', related files and the |
6 | services they provide. | 6 | services they provide. |
7 | 7 | ||
8 | If you are short in patience and just want to know how to add your hard disc to | 8 | If you are short in patience and just want to know how to add your hard disc to |
diff --git a/Documentation/serial/serial-rs485.txt b/Documentation/serial/serial-rs485.txt index 41c8378c0b2f..39dac95422a3 100644 --- a/Documentation/serial/serial-rs485.txt +++ b/Documentation/serial/serial-rs485.txt | |||
@@ -132,5 +132,5 @@ | |||
132 | 132 | ||
133 | 5. REFERENCES | 133 | 5. REFERENCES |
134 | 134 | ||
135 | [1] include/linux/serial.h | 135 | [1] include/uapi/linux/serial.h |
136 | [2] Documentation/devicetree/bindings/serial/rs485.txt | 136 | [2] Documentation/devicetree/bindings/serial/rs485.txt |
diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.txt index 540db41dfd5d..1e52d67d0abf 100644 --- a/Documentation/serial/tty.txt +++ b/Documentation/serial/tty.txt | |||
@@ -146,7 +146,7 @@ set_termios() Notify the tty driver that the device's termios | |||
146 | driver function is responsible for modifying any | 146 | driver function is responsible for modifying any |
147 | bits in the request it cannot fulfill to indicate | 147 | bits in the request it cannot fulfill to indicate |
148 | the actual modes being used. A device with no | 148 | the actual modes being used. A device with no |
149 | hardware capability for change (eg a USB dongle or | 149 | hardware capability for change (e.g. a USB dongle or |
150 | virtual port) can provide NULL for this method. | 150 | virtual port) can provide NULL for this method. |
151 | 151 | ||
152 | throttle() Notify the tty driver that input buffers for the | 152 | throttle() Notify the tty driver that input buffers for the |
@@ -258,7 +258,7 @@ put_char() - Stuff a single character onto the queue. The | |||
258 | 258 | ||
259 | flush_chars() - Ask the kernel to write put_char queue | 259 | flush_chars() - Ask the kernel to write put_char queue |
260 | 260 | ||
261 | write_room() - Return the number of characters tht can be stuffed | 261 | write_room() - Return the number of characters that can be stuffed |
262 | into the port buffers without overflow (or less). | 262 | into the port buffers without overflow (or less). |
263 | The ldisc is responsible for being intelligent | 263 | The ldisc is responsible for being intelligent |
264 | about multi-threading of write_room/write calls | 264 | about multi-threading of write_room/write calls |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index ed30699cc635..af76634f8d98 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -671,7 +671,7 @@ config TICKSOURCE_CORETMR | |||
671 | default y | 671 | default y |
672 | endmenu | 672 | endmenu |
673 | 673 | ||
674 | menu "Clock souce" | 674 | menu "Clock source" |
675 | depends on GENERIC_CLOCKEVENTS | 675 | depends on GENERIC_CLOCKEVENTS |
676 | config CYCLES_CLOCKSOURCE | 676 | config CYCLES_CLOCKSOURCE |
677 | bool "CYCLES" | 677 | bool "CYCLES" |
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 1f94784eab6d..694619365265 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
@@ -455,7 +455,7 @@ void handle_sec_sci_fault(uint32_t gstat) | |||
455 | printk(KERN_DEBUG "sec ack err\n"); | 455 | printk(KERN_DEBUG "sec ack err\n"); |
456 | break; | 456 | break; |
457 | default: | 457 | default: |
458 | printk(KERN_DEBUG "sec sci unknow err\n"); | 458 | printk(KERN_DEBUG "sec sci unknown err\n"); |
459 | } | 459 | } |
460 | } | 460 | } |
461 | 461 | ||
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices index d163991c5717..2a74777667fd 100644 --- a/arch/m68k/Kconfig.devices +++ b/arch/m68k/Kconfig.devices | |||
@@ -73,7 +73,7 @@ config ATARI_ETHERNEC | |||
73 | ROM port. The driver works by polling instead of interrupts, so it | 73 | ROM port. The driver works by polling instead of interrupts, so it |
74 | is quite slow. | 74 | is quite slow. |
75 | 75 | ||
76 | This driver also suppports the ethernet part of the NetUSBee ROM | 76 | This driver also supports the ethernet part of the NetUSBee ROM |
77 | port combined Ethernet/USB adapter. | 77 | port combined Ethernet/USB adapter. |
78 | 78 | ||
79 | To compile the actual ethernet driver, choose Y or M in for the NE2000 | 79 | To compile the actual ethernet driver, choose Y or M in for the NE2000 |
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig index 602866657938..c370426a7322 100644 --- a/arch/mips/cavium-octeon/Kconfig +++ b/arch/mips/cavium-octeon/Kconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | if CPU_CAVIUM_OCTEON | 1 | if CPU_CAVIUM_OCTEON |
2 | 2 | ||
3 | config CAVIUM_CN63XXP1 | 3 | config CAVIUM_CN63XXP1 |
4 | bool "Enable CN63XXP1 errata worarounds" | 4 | bool "Enable CN63XXP1 errata workarounds" |
5 | default "n" | 5 | default "n" |
6 | help | 6 | help |
7 | The CN63XXP1 chip requires build time workarounds to | 7 | The CN63XXP1 chip requires build time workarounds to |
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c index 8f1866d8124d..468ffa043607 100644 --- a/arch/mips/lantiq/falcon/sysctrl.c +++ b/arch/mips/lantiq/falcon/sysctrl.c | |||
@@ -221,7 +221,7 @@ void __init ltq_soc_init(void) | |||
221 | (request_mem_region(res_sys[2].start, | 221 | (request_mem_region(res_sys[2].start, |
222 | resource_size(&res_sys[2]), | 222 | resource_size(&res_sys[2]), |
223 | res_sys[2].name) < 0)) | 223 | res_sys[2].name) < 0)) |
224 | pr_err("Failed to request core reources"); | 224 | pr_err("Failed to request core resources"); |
225 | 225 | ||
226 | status_membase = ioremap_nocache(res_status.start, | 226 | status_membase = ioremap_nocache(res_status.start, |
227 | resource_size(&res_status)); | 227 | resource_size(&res_status)); |
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c index 51804b10a036..2b15491de494 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c | |||
@@ -318,7 +318,7 @@ void __init ltq_soc_init(void) | |||
318 | res_cgu.name) < 0) || | 318 | res_cgu.name) < 0) || |
319 | (request_mem_region(res_ebu.start, resource_size(&res_ebu), | 319 | (request_mem_region(res_ebu.start, resource_size(&res_ebu), |
320 | res_ebu.name) < 0)) | 320 | res_ebu.name) < 0)) |
321 | pr_err("Failed to request core reources"); | 321 | pr_err("Failed to request core resources"); |
322 | 322 | ||
323 | pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu)); | 323 | pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu)); |
324 | ltq_cgu_membase = ioremap_nocache(res_cgu.start, | 324 | ltq_cgu_membase = ioremap_nocache(res_cgu.start, |
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index cb1ef9984069..37fe8e7887e2 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c | |||
@@ -218,7 +218,7 @@ static int ltq_pci_probe(struct platform_device *pdev) | |||
218 | res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 218 | res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
219 | res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 219 | res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
220 | if (!res_cfg || !res_bridge) { | 220 | if (!res_cfg || !res_bridge) { |
221 | dev_err(&pdev->dev, "missing memory reources\n"); | 221 | dev_err(&pdev->dev, "missing memory resources\n"); |
222 | return -EINVAL; | 222 | return -EINVAL; |
223 | } | 223 | } |
224 | 224 | ||
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index a648de1b1096..4434b54e1d87 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
@@ -181,7 +181,7 @@ endmenu | |||
181 | config SMP | 181 | config SMP |
182 | bool "Symmetric multi-processing support" | 182 | bool "Symmetric multi-processing support" |
183 | default y | 183 | default y |
184 | depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050 | 184 | depends on MN10300_PROC_MN2WS0050 |
185 | ---help--- | 185 | ---help--- |
186 | This enables support for systems with more than one CPU. If you have | 186 | This enables support for systems with more than one CPU. If you have |
187 | a system with only one CPU, say N. If you have a system with more | 187 | a system with only one CPU, say N. If you have a system with more |
diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c index 21cd48074ec8..9f8c678f0d9a 100644 --- a/arch/powerpc/boot/simpleboot.c +++ b/arch/powerpc/boot/simpleboot.c | |||
@@ -61,7 +61,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
61 | if (*reg++ != 0) | 61 | if (*reg++ != 0) |
62 | fatal("Memory range is not based at address 0\n"); | 62 | fatal("Memory range is not based at address 0\n"); |
63 | 63 | ||
64 | /* get the memsize and trucate it to under 4G on 32 bit machines */ | 64 | /* get the memsize and truncate it to under 4G on 32 bit machines */ |
65 | memsize64 = 0; | 65 | memsize64 = 0; |
66 | for (i = 0; i < *ns; i++) | 66 | for (i = 0; i < *ns; i++) |
67 | memsize64 = (memsize64 << 32) | *reg++; | 67 | memsize64 = (memsize64 << 32) | *reg++; |
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index b44eec3e8dbd..4b005ae5dc4b 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c | |||
@@ -322,7 +322,7 @@ static void opal_handle_message(void) | |||
322 | 322 | ||
323 | /* check for errors. */ | 323 | /* check for errors. */ |
324 | if (ret) { | 324 | if (ret) { |
325 | pr_warning("%s: Failed to retrive opal message, err=%lld\n", | 325 | pr_warning("%s: Failed to retrieve opal message, err=%lld\n", |
326 | __func__, ret); | 326 | __func__, ret); |
327 | return; | 327 | return; |
328 | } | 328 | } |
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 17ee193960a0..34064f50945e 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c | |||
@@ -126,7 +126,7 @@ static int pseries_remove_mem_node(struct device_node *np) | |||
126 | return 0; | 126 | return 0; |
127 | 127 | ||
128 | /* | 128 | /* |
129 | * Find the bae address and size of the memblock | 129 | * Find the base address and size of the memblock |
130 | */ | 130 | */ |
131 | regs = of_get_property(np, "reg", NULL); | 131 | regs = of_get_property(np, "reg", NULL); |
132 | if (!regs) | 132 | if (!regs) |
@@ -200,7 +200,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr) | |||
200 | 200 | ||
201 | /* The first int of the property is the number of lmb's described | 201 | /* The first int of the property is the number of lmb's described |
202 | * by the property. This is followed by an array of of_drconf_cell | 202 | * by the property. This is followed by an array of of_drconf_cell |
203 | * entries. Get the niumber of entries and skip to the array of | 203 | * entries. Get the number of entries and skip to the array of |
204 | * of_drconf_cell's. | 204 | * of_drconf_cell's. |
205 | */ | 205 | */ |
206 | entries = be32_to_cpu(*p++); | 206 | entries = be32_to_cpu(*p++); |
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 4ac8cae5727c..366e1b599a7b 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig | |||
@@ -22,17 +22,14 @@ choice | |||
22 | config ARCH_SCORE7 | 22 | config ARCH_SCORE7 |
23 | bool "SCORE7 processor" | 23 | bool "SCORE7 processor" |
24 | select SYS_SUPPORTS_32BIT_KERNEL | 24 | select SYS_SUPPORTS_32BIT_KERNEL |
25 | select GENERIC_HAS_IOMAP | ||
26 | 25 | ||
27 | config MACH_SPCT6600 | 26 | config MACH_SPCT6600 |
28 | bool "SPCT6600 series based machines" | 27 | bool "SPCT6600 series based machines" |
29 | select SYS_SUPPORTS_32BIT_KERNEL | 28 | select SYS_SUPPORTS_32BIT_KERNEL |
30 | select GENERIC_HAS_IOMAP | ||
31 | 29 | ||
32 | config SCORE_SIM | 30 | config SCORE_SIM |
33 | bool "Score simulator" | 31 | bool "Score simulator" |
34 | select SYS_SUPPORTS_32BIT_KERNEL | 32 | select SYS_SUPPORTS_32BIT_KERNEL |
35 | select GENERIC_HAS_IOMAP | ||
36 | endchoice | 33 | endchoice |
37 | 34 | ||
38 | endmenu | 35 | endmenu |
diff --git a/block/blk-core.c b/block/blk-core.c index bf930f481d43..9c888bd22b00 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -240,7 +240,7 @@ EXPORT_SYMBOL(blk_stop_queue); | |||
240 | * this function. | 240 | * this function. |
241 | * | 241 | * |
242 | * This function does not cancel any asynchronous activity arising | 242 | * This function does not cancel any asynchronous activity arising |
243 | * out of elevator or throttling code. That would require elevaotor_exit() | 243 | * out of elevator or throttling code. That would require elevator_exit() |
244 | * and blkcg_exit_queue() to be called with queue lock initialized. | 244 | * and blkcg_exit_queue() to be called with queue lock initialized. |
245 | * | 245 | * |
246 | */ | 246 | */ |
@@ -933,7 +933,7 @@ static struct io_context *rq_ioc(struct bio *bio) | |||
933 | * Get a free request from @q. This function may fail under memory | 933 | * Get a free request from @q. This function may fail under memory |
934 | * pressure or if @q is dead. | 934 | * pressure or if @q is dead. |
935 | * | 935 | * |
936 | * Must be callled with @q->queue_lock held and, | 936 | * Must be called with @q->queue_lock held and, |
937 | * Returns %NULL on failure, with @q->queue_lock held. | 937 | * Returns %NULL on failure, with @q->queue_lock held. |
938 | * Returns !%NULL on success, with @q->queue_lock *not held*. | 938 | * Returns !%NULL on success, with @q->queue_lock *not held*. |
939 | */ | 939 | */ |
@@ -1110,7 +1110,7 @@ rq_starved: | |||
1110 | * Get a free request from @q. If %__GFP_WAIT is set in @gfp_mask, this | 1110 | * Get a free request from @q. If %__GFP_WAIT is set in @gfp_mask, this |
1111 | * function keeps retrying under memory pressure and fails iff @q is dead. | 1111 | * function keeps retrying under memory pressure and fails iff @q is dead. |
1112 | * | 1112 | * |
1113 | * Must be callled with @q->queue_lock held and, | 1113 | * Must be called with @q->queue_lock held and, |
1114 | * Returns %NULL on failure, with @q->queue_lock held. | 1114 | * Returns %NULL on failure, with @q->queue_lock held. |
1115 | * Returns !%NULL on success, with @q->queue_lock *not held*. | 1115 | * Returns !%NULL on success, with @q->queue_lock *not held*. |
1116 | */ | 1116 | */ |
@@ -1241,7 +1241,7 @@ struct request *blk_make_request(struct request_queue *q, struct bio *bio, | |||
1241 | EXPORT_SYMBOL(blk_make_request); | 1241 | EXPORT_SYMBOL(blk_make_request); |
1242 | 1242 | ||
1243 | /** | 1243 | /** |
1244 | * blk_rq_set_block_pc - initialize a requeest to type BLOCK_PC | 1244 | * blk_rq_set_block_pc - initialize a request to type BLOCK_PC |
1245 | * @rq: request to be initialized | 1245 | * @rq: request to be initialized |
1246 | * | 1246 | * |
1247 | */ | 1247 | */ |
diff --git a/block/genhd.c b/block/genhd.c index e6723bd4d7a1..bd3060684ab2 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -1545,7 +1545,7 @@ void disk_flush_events(struct gendisk *disk, unsigned int mask) | |||
1545 | /** | 1545 | /** |
1546 | * disk_clear_events - synchronously check, clear and return pending events | 1546 | * disk_clear_events - synchronously check, clear and return pending events |
1547 | * @disk: disk to fetch and clear events from | 1547 | * @disk: disk to fetch and clear events from |
1548 | * @mask: mask of events to be fetched and clearted | 1548 | * @mask: mask of events to be fetched and cleared |
1549 | * | 1549 | * |
1550 | * Disk events are synchronously checked and pending events in @mask | 1550 | * Disk events are synchronously checked and pending events in @mask |
1551 | * are cleared and returned. This ignores the block count. | 1551 | * are cleared and returned. This ignores the block count. |
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index 719cb1bc1640..3b7c9f1be484 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c | |||
@@ -69,8 +69,8 @@ | |||
69 | nice This parameter controls the driver's use of | 69 | nice This parameter controls the driver's use of |
70 | idle CPU time, at the expense of some speed. | 70 | idle CPU time, at the expense of some speed. |
71 | 71 | ||
72 | If this driver is built into the kernel, you can use kernel | 72 | If this driver is built into the kernel, you can use the |
73 | the following command line parameters, with the same values | 73 | following kernel command line parameters, with the same values |
74 | as the corresponding module parameters listed above: | 74 | as the corresponding module parameters listed above: |
75 | 75 | ||
76 | pcd.drive0 | 76 | pcd.drive0 |
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c index d97069b8a8e4..6a92284a86b2 100644 --- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c +++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c | |||
@@ -436,7 +436,7 @@ static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) | |||
436 | ret = adf_ctl_ioctl_get_status(fp, cmd, arg); | 436 | ret = adf_ctl_ioctl_get_status(fp, cmd, arg); |
437 | break; | 437 | break; |
438 | default: | 438 | default: |
439 | pr_err("QAT: Invalid ioclt\n"); | 439 | pr_err("QAT: Invalid ioctl\n"); |
440 | ret = -EFAULT; | 440 | ret = -EFAULT; |
441 | break; | 441 | break; |
442 | } | 442 | } |
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index eee79e1c3222..afcc8dd40bdd 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
@@ -946,7 +946,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, | |||
946 | DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n", | 946 | DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n", |
947 | port_name(port)); | 947 | port_name(port)); |
948 | if (is_dvi && (port == PORT_A || port == PORT_E)) | 948 | if (is_dvi && (port == PORT_A || port == PORT_E)) |
949 | DRM_DEBUG_KMS("Port %c is TMDS compabile\n", port_name(port)); | 949 | DRM_DEBUG_KMS("Port %c is TMDS compatible\n", port_name(port)); |
950 | if (!is_dvi && !is_dp && !is_crt) | 950 | if (!is_dvi && !is_dp && !is_crt) |
951 | DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n", | 951 | DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n", |
952 | port_name(port)); | 952 | port_name(port)); |
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 2ac87fa3058d..2e45ae3796f1 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -357,7 +357,7 @@ config I2C_BCM_KONA | |||
357 | If you say yes to this option, support will be included for the | 357 | If you say yes to this option, support will be included for the |
358 | I2C interface on the Broadcom Kona family of processors. | 358 | I2C interface on the Broadcom Kona family of processors. |
359 | 359 | ||
360 | If you do not need KONA I2C inteface, say N. | 360 | If you do not need KONA I2C interface, say N. |
361 | 361 | ||
362 | config I2C_BLACKFIN_TWI | 362 | config I2C_BLACKFIN_TWI |
363 | tristate "Blackfin TWI I2C support" | 363 | tristate "Blackfin TWI I2C support" |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index e086fb075f2b..e3b0337faeb7 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -244,7 +244,7 @@ static bool is_ack(struct s3c24xx_i2c *i2c) | |||
244 | } | 244 | } |
245 | usleep_range(1000, 2000); | 245 | usleep_range(1000, 2000); |
246 | } | 246 | } |
247 | dev_err(i2c->dev, "ack was not recieved\n"); | 247 | dev_err(i2c->dev, "ack was not received\n"); |
248 | return false; | 248 | return false; |
249 | } | 249 | } |
250 | 250 | ||
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 8f5f2577f288..e8b8569788c0 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | |||
@@ -1870,7 +1870,7 @@ static int ocrdma_build_inline_sges(struct ocrdma_qp *qp, | |||
1870 | hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge); | 1870 | hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge); |
1871 | if (unlikely(hdr->total_len > qp->max_inline_data)) { | 1871 | if (unlikely(hdr->total_len > qp->max_inline_data)) { |
1872 | pr_err("%s() supported_len=0x%x,\n" | 1872 | pr_err("%s() supported_len=0x%x,\n" |
1873 | " unspported len req=0x%x\n", __func__, | 1873 | " unsupported len req=0x%x\n", __func__, |
1874 | qp->max_inline_data, hdr->total_len); | 1874 | qp->max_inline_data, hdr->total_len); |
1875 | return -EINVAL; | 1875 | return -EINVAL; |
1876 | } | 1876 | } |
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c index f8dfd76be89f..db3588df3546 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | |||
@@ -511,7 +511,7 @@ int usnic_ib_qp_grp_modify(struct usnic_ib_qp_grp *qp_grp, | |||
511 | usnic_ib_qp_grp_state_to_string(old_state), | 511 | usnic_ib_qp_grp_state_to_string(old_state), |
512 | usnic_ib_qp_grp_state_to_string(new_state)); | 512 | usnic_ib_qp_grp_state_to_string(new_state)); |
513 | } else { | 513 | } else { |
514 | usnic_err("Failed to transistion %u from %s to %s", | 514 | usnic_err("Failed to transition %u from %s to %s", |
515 | qp_grp->grp_id, | 515 | qp_grp->grp_id, |
516 | usnic_ib_qp_grp_state_to_string(old_state), | 516 | usnic_ib_qp_grp_state_to_string(old_state), |
517 | usnic_ib_qp_grp_state_to_string(new_state)); | 517 | usnic_ib_qp_grp_state_to_string(new_state)); |
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index b8632bf9a7f3..a31a9e40eed9 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig | |||
@@ -109,7 +109,7 @@ config XTENSA_MX | |||
109 | config IRQ_CROSSBAR | 109 | config IRQ_CROSSBAR |
110 | bool | 110 | bool |
111 | help | 111 | help |
112 | Support for a CROSSBAR ip that preceeds the main interrupt controller. | 112 | Support for a CROSSBAR ip that precedes the main interrupt controller. |
113 | The primary irqchip invokes the crossbar's callback which inturn allocates | 113 | The primary irqchip invokes the crossbar's callback which inturn allocates |
114 | a free irq and configures the IP. Thus the peripheral interrupts are | 114 | a free irq and configures the IP. Thus the peripheral interrupts are |
115 | routed to one of the free irqchip interrupt lines. | 115 | routed to one of the free irqchip interrupt lines. |
diff --git a/drivers/media/i2c/cx25840/cx25840-ir.c b/drivers/media/i2c/cx25840/cx25840-ir.c index e6588ee5bdb0..4cf8f18bf097 100644 --- a/drivers/media/i2c/cx25840/cx25840-ir.c +++ b/drivers/media/i2c/cx25840/cx25840-ir.c | |||
@@ -224,7 +224,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count) | |||
224 | } | 224 | } |
225 | 225 | ||
226 | /* | 226 | /* |
227 | * FIFO register pulse width count compuations | 227 | * FIFO register pulse width count computations |
228 | */ | 228 | */ |
229 | static u32 clock_divider_to_resolution(u16 divider) | 229 | static u32 clock_divider_to_resolution(u16 divider) |
230 | { | 230 | { |
diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c index 2c951dec2d33..c2ff5fc01157 100644 --- a/drivers/media/pci/cx23885/cx23888-ir.c +++ b/drivers/media/pci/cx23885/cx23888-ir.c | |||
@@ -263,7 +263,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | /* | 265 | /* |
266 | * FIFO register pulse width count compuations | 266 | * FIFO register pulse width count computations |
267 | */ | 267 | */ |
268 | static u32 clock_divider_to_resolution(u16 divider) | 268 | static u32 clock_divider_to_resolution(u16 divider) |
269 | { | 269 | { |
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c index e60cbb3aa609..f86cec091bf4 100644 --- a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | |||
@@ -259,7 +259,7 @@ static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val) | |||
259 | fine = val % VV6410_CIF_LINELENGTH; | 259 | fine = val % VV6410_CIF_LINELENGTH; |
260 | coarse = min(512, val / VV6410_CIF_LINELENGTH); | 260 | coarse = min(512, val / VV6410_CIF_LINELENGTH); |
261 | 261 | ||
262 | PDEBUG(D_CONF, "Set coarse exposure to %d, fine expsure to %d", | 262 | PDEBUG(D_CONF, "Set coarse exposure to %d, fine exposure to %d", |
263 | coarse, fine); | 263 | coarse, fine); |
264 | 264 | ||
265 | err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); | 265 | err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); |
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index a0e9422b55a2..959c313d84a7 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c | |||
@@ -424,7 +424,7 @@ static int mei_me_pm_runtime_resume(struct device *device) | |||
424 | } | 424 | } |
425 | 425 | ||
426 | /** | 426 | /** |
427 | * mei_me_set_pm_domain - fill and set pm domian stucture for device | 427 | * mei_me_set_pm_domain - fill and set pm domain structure for device |
428 | * | 428 | * |
429 | * @dev: mei_device | 429 | * @dev: mei_device |
430 | */ | 430 | */ |
@@ -444,7 +444,7 @@ static inline void mei_me_set_pm_domain(struct mei_device *dev) | |||
444 | } | 444 | } |
445 | 445 | ||
446 | /** | 446 | /** |
447 | * mei_me_unset_pm_domain - clean pm domian stucture for device | 447 | * mei_me_unset_pm_domain - clean pm domain structure for device |
448 | * | 448 | * |
449 | * @dev: mei_device | 449 | * @dev: mei_device |
450 | */ | 450 | */ |
diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index 19de57368b7a..74727dda51c1 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c | |||
@@ -371,7 +371,7 @@ static int mei_txe_pm_runtime_resume(struct device *device) | |||
371 | } | 371 | } |
372 | 372 | ||
373 | /** | 373 | /** |
374 | * mei_txe_set_pm_domain - fill and set pm domian stucture for device | 374 | * mei_txe_set_pm_domain - fill and set pm domain structure for device |
375 | * | 375 | * |
376 | * @dev: mei_device | 376 | * @dev: mei_device |
377 | */ | 377 | */ |
@@ -391,7 +391,7 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev) | |||
391 | } | 391 | } |
392 | 392 | ||
393 | /** | 393 | /** |
394 | * mei_txe_unset_pm_domain - clean pm domian stucture for device | 394 | * mei_txe_unset_pm_domain - clean pm domain structure for device |
395 | * | 395 | * |
396 | * @dev: mei_device | 396 | * @dev: mei_device |
397 | */ | 397 | */ |
diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c index 5cd532ca1cfe..b01b0ce4d1be 100644 --- a/drivers/net/bonding/bond_sysfs_slave.c +++ b/drivers/net/bonding/bond_sysfs_slave.c | |||
@@ -36,7 +36,7 @@ static ssize_t state_show(struct slave *slave, char *buf) | |||
36 | case BOND_STATE_BACKUP: | 36 | case BOND_STATE_BACKUP: |
37 | return sprintf(buf, "backup\n"); | 37 | return sprintf(buf, "backup\n"); |
38 | default: | 38 | default: |
39 | return sprintf(buf, "UNKONWN\n"); | 39 | return sprintf(buf, "UNKNOWN\n"); |
40 | } | 40 | } |
41 | } | 41 | } |
42 | static SLAVE_ATTR_RO(state); | 42 | static SLAVE_ATTR_RO(state); |
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 02a2e90d581a..923c4878461e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c | |||
@@ -1695,7 +1695,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) | |||
1695 | if (err) { | 1695 | if (err) { |
1696 | vp_oper->vlan_idx = NO_INDX; | 1696 | vp_oper->vlan_idx = NO_INDX; |
1697 | mlx4_warn(&priv->dev, | 1697 | mlx4_warn(&priv->dev, |
1698 | "No vlan resorces slave %d, port %d\n", | 1698 | "No vlan resources slave %d, port %d\n", |
1699 | slave, port); | 1699 | slave, port); |
1700 | return err; | 1700 | return err; |
1701 | } | 1701 | } |
@@ -1711,7 +1711,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) | |||
1711 | err = vp_oper->mac_idx; | 1711 | err = vp_oper->mac_idx; |
1712 | vp_oper->mac_idx = NO_INDX; | 1712 | vp_oper->mac_idx = NO_INDX; |
1713 | mlx4_warn(&priv->dev, | 1713 | mlx4_warn(&priv->dev, |
1714 | "No mac resorces slave %d, port %d\n", | 1714 | "No mac resources slave %d, port %d\n", |
1715 | slave, port); | 1715 | slave, port); |
1716 | return err; | 1716 | return err; |
1717 | } | 1717 | } |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index db4280ce9c09..716fc37ada5a 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | |||
@@ -922,7 +922,7 @@ int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd) | |||
922 | 922 | ||
923 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 923 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
924 | if (rv != 0) { | 924 | if (rv != 0) { |
925 | printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n", | 925 | printk(KERN_ERR "%s: could not notify %s IP 0x%x request\n", |
926 | adapter->netdev->name, | 926 | adapter->netdev->name, |
927 | (cmd == NX_IP_UP) ? "Add" : "Remove", ip); | 927 | (cmd == NX_IP_UP) ? "Add" : "Remove", ip); |
928 | } | 928 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 851cb4a80d50..03cd4c3d7835 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | |||
@@ -941,7 +941,7 @@ void qlcnic_82xx_config_ipaddr(struct qlcnic_adapter *adapter, | |||
941 | rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 941 | rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
942 | if (rv != 0) | 942 | if (rv != 0) |
943 | dev_err(&adapter->netdev->dev, | 943 | dev_err(&adapter->netdev->dev, |
944 | "could not notify %s IP 0x%x reuqest\n", | 944 | "could not notify %s IP 0x%x request\n", |
945 | (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); | 945 | (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); |
946 | } | 946 | } |
947 | 947 | ||
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index f5fbc12d3e10..a43e8492b1ce 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c | |||
@@ -2056,7 +2056,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) | |||
2056 | struct sk_buff *skb; | 2056 | struct sk_buff *skb; |
2057 | 2057 | ||
2058 | if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { | 2058 | if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { |
2059 | VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame span multple RDs.\n", vptr->netdev->name); | 2059 | VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame spans multiple RDs.\n", vptr->netdev->name); |
2060 | stats->rx_length_errors++; | 2060 | stats->rx_length_errors++; |
2061 | return -EINVAL; | 2061 | return -EINVAL; |
2062 | } | 2062 | } |
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 47a998d8f99e..40ab7f0b7be0 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c | |||
@@ -1353,7 +1353,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev, | |||
1353 | wait_event_interruptible_timeout(priv->scan_q, | 1353 | wait_event_interruptible_timeout(priv->scan_q, |
1354 | (priv->scan_req == NULL), | 1354 | (priv->scan_req == NULL), |
1355 | (15 * HZ)); | 1355 | (15 * HZ)); |
1356 | lbs_deb_assoc("assoc: scanning competed\n"); | 1356 | lbs_deb_assoc("assoc: scanning completed\n"); |
1357 | } | 1357 | } |
1358 | 1358 | ||
1359 | /* Find the BSS we want using available scan results */ | 1359 | /* Find the BSS we want using available scan results */ |
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 088de9d25c39..25c5acc78bd1 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
@@ -332,7 +332,7 @@ static int lbtf_op_start(struct ieee80211_hw *hw) | |||
332 | 332 | ||
333 | err_prog_firmware: | 333 | err_prog_firmware: |
334 | priv->hw_reset_device(card); | 334 | priv->hw_reset_device(card); |
335 | lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programing fw; ret=%d", ret); | 335 | lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programming fw; ret=%d", ret); |
336 | return ret; | 336 | return ret; |
337 | } | 337 | } |
338 | 338 | ||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 3bbcbf12c1fb..4dcfb7116a04 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -540,7 +540,7 @@ config ASUS_NB_WMI | |||
540 | This is a driver for newer Asus notebooks. It adds extra features | 540 | This is a driver for newer Asus notebooks. It adds extra features |
541 | like wireless radio and bluetooth control, leds, hotkeys, backlight... | 541 | like wireless radio and bluetooth control, leds, hotkeys, backlight... |
542 | 542 | ||
543 | For more informations, see | 543 | For more information, see |
544 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> | 544 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> |
545 | 545 | ||
546 | If you have an ACPI-WMI compatible Asus Notebook, say Y or M | 546 | If you have an ACPI-WMI compatible Asus Notebook, say Y or M |
@@ -553,7 +553,7 @@ config EEEPC_WMI | |||
553 | This is a driver for newer Eee PC laptops. It adds extra features | 553 | This is a driver for newer Eee PC laptops. It adds extra features |
554 | like wireless radio and bluetooth control, leds, hotkeys, backlight... | 554 | like wireless radio and bluetooth control, leds, hotkeys, backlight... |
555 | 555 | ||
556 | For more informations, see | 556 | For more information, see |
557 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> | 557 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> |
558 | 558 | ||
559 | If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M | 559 | If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M |
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx index 6739069477de..3b3d599103f8 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic79xx +++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx | |||
@@ -70,7 +70,7 @@ config AIC79XX_DEBUG_MASK | |||
70 | default "0" | 70 | default "0" |
71 | help | 71 | help |
72 | Bit mask of debug options that is only valid if the | 72 | Bit mask of debug options that is only valid if the |
73 | CONFIG_AIC79XX_DEBUG_ENBLE option is enabled. The bits in this mask | 73 | CONFIG_AIC79XX_DEBUG_ENABLE option is enabled. The bits in this mask |
74 | are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the | 74 | are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the |
75 | variable ahd_debug in that file to find them. | 75 | variable ahd_debug in that file to find them. |
76 | 76 | ||
diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c index 2c613bdea78f..5980c10c734d 100644 --- a/drivers/scsi/fnic/fnic_debugfs.c +++ b/drivers/scsi/fnic/fnic_debugfs.c | |||
@@ -210,7 +210,7 @@ static ssize_t fnic_trace_ctrl_write(struct file *filp, | |||
210 | else if (*trace_type == fc_trc_flag->fc_clear) | 210 | else if (*trace_type == fc_trc_flag->fc_clear) |
211 | fnic_fc_trace_cleared = val; | 211 | fnic_fc_trace_cleared = val; |
212 | else | 212 | else |
213 | pr_err("fnic: cannot write to any debufs file\n"); | 213 | pr_err("fnic: cannot write to any debugfs file\n"); |
214 | 214 | ||
215 | (*ppos)++; | 215 | (*ppos)++; |
216 | 216 | ||
diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index c77285926827..8b1b38751b49 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c | |||
@@ -592,7 +592,7 @@ int fnic_fc_trace_set_data(u32 host_no, u8 frame_type, | |||
592 | 592 | ||
593 | if (fnic_fc_trace_cleared == 1) { | 593 | if (fnic_fc_trace_cleared == 1) { |
594 | fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0; | 594 | fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0; |
595 | pr_info("fnic: Reseting the read idx\n"); | 595 | pr_info("fnic: Resetting the read idx\n"); |
596 | memset((void *)fnic_fc_ctlr_trace_buf_p, 0, | 596 | memset((void *)fnic_fc_ctlr_trace_buf_p, 0, |
597 | fnic_fc_trace_max_pages * PAGE_SIZE); | 597 | fnic_fc_trace_max_pages * PAGE_SIZE); |
598 | fnic_fc_trace_cleared = 0; | 598 | fnic_fc_trace_cleared = 0; |
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 50b086aef178..53284eb23a15 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
@@ -930,7 +930,7 @@ static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done)(struct s | |||
930 | 930 | ||
931 | /* check target ID is not same as this initiator ID */ | 931 | /* check target ID is not same as this initiator ID */ |
932 | if (scmd_id(SCpnt) == SCpnt->device->host->this_id) { | 932 | if (scmd_id(SCpnt) == SCpnt->device->host->this_id) { |
933 | nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "terget==host???"); | 933 | nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "target==host???"); |
934 | SCpnt->result = DID_BAD_TARGET << 16; | 934 | SCpnt->result = DID_BAD_TARGET << 16; |
935 | done(SCpnt); | 935 | done(SCpnt); |
936 | return 0; | 936 | return 0; |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 340ceff03823..34aad32829f5 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -533,7 +533,7 @@ static int nsp_negate_signal(struct scsi_cmnd *SCpnt, unsigned char mask, | |||
533 | } while ((--time_out != 0) && (reg & mask) != 0); | 533 | } while ((--time_out != 0) && (reg & mask) != 0); |
534 | 534 | ||
535 | if (time_out == 0) { | 535 | if (time_out == 0) { |
536 | nsp_msg(KERN_DEBUG, " %s signal off timeut", str); | 536 | nsp_msg(KERN_DEBUG, " %s signal off timeout", str); |
537 | } | 537 | } |
538 | 538 | ||
539 | return 0; | 539 | return 0; |
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c index da9e3902f219..24a852828b5d 100644 --- a/drivers/scsi/qla2xxx/qla_nx2.c +++ b/drivers/scsi/qla2xxx/qla_nx2.c | |||
@@ -399,7 +399,7 @@ qla8044_idc_lock(struct qla_hw_data *ha) | |||
399 | */ | 399 | */ |
400 | ql_dbg(ql_dbg_p3p, vha, 0xb08a, | 400 | ql_dbg(ql_dbg_p3p, vha, 0xb08a, |
401 | "%s: IDC lock Recovery by %d " | 401 | "%s: IDC lock Recovery by %d " |
402 | "failed, Retrying timout\n", __func__, | 402 | "failed, Retrying timeout\n", __func__, |
403 | ha->portnum); | 403 | ha->portnum); |
404 | timeout = 0; | 404 | timeout = 0; |
405 | } | 405 | } |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 82800a775501..56f4336ffa86 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -126,7 +126,7 @@ config XPS_USB_HCD_XILINX | |||
126 | select USB_EHCI_BIG_ENDIAN_DESC | 126 | select USB_EHCI_BIG_ENDIAN_DESC |
127 | select USB_EHCI_BIG_ENDIAN_MMIO | 127 | select USB_EHCI_BIG_ENDIAN_MMIO |
128 | ---help--- | 128 | ---help--- |
129 | Xilinx xps USB host controller core is EHCI compilant and has | 129 | Xilinx xps USB host controller core is EHCI compliant and has |
130 | transaction translator built-in. It can be configured to either | 130 | transaction translator built-in. It can be configured to either |
131 | support both high speed and full speed devices, or high speed | 131 | support both high speed and full speed devices, or high speed |
132 | devices only. | 132 | devices only. |
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index 7db5234462d0..a6f7cc0a0883 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c | |||
@@ -216,7 +216,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev) | |||
216 | data->reg_duty_cycle = res->start; | 216 | data->reg_duty_cycle = res->start; |
217 | res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on"); | 217 | res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on"); |
218 | if (!res) { | 218 | if (!res) { |
219 | dev_err(&pdev->dev, "No REG resorce for always on\n"); | 219 | dev_err(&pdev->dev, "No REG resource for always on\n"); |
220 | return -ENXIO; | 220 | return -ENXIO; |
221 | } | 221 | } |
222 | data->reg_always_on = res->start; | 222 | data->reg_always_on = res->start; |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 1d1ba083ca6e..d0262ceb85e1 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -3994,7 +3994,8 @@ again: | |||
3994 | if (ret < 0) { | 3994 | if (ret < 0) { |
3995 | err = ret; | 3995 | err = ret; |
3996 | goto out_unlock; | 3996 | goto out_unlock; |
3997 | } if (ret) { | 3997 | } |
3998 | if (ret) { | ||
3998 | ins_nr = 0; | 3999 | ins_nr = 0; |
3999 | btrfs_release_path(path); | 4000 | btrfs_release_path(path); |
4000 | continue; | 4001 | continue; |
diff --git a/fs/stack.c b/fs/stack.c index 5b5388250e29..a54e33ed10f1 100644 --- a/fs/stack.c +++ b/fs/stack.c | |||
@@ -44,7 +44,7 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src) | |||
44 | * include/linux/fs.h). We don't necessarily hold i_mutex when this | 44 | * include/linux/fs.h). We don't necessarily hold i_mutex when this |
45 | * is called, so take i_lock for that case. | 45 | * is called, so take i_lock for that case. |
46 | * | 46 | * |
47 | * And if CONFIG_LBADF (on 32-bit), continue our effort to keep the | 47 | * And if CONFIG_LBDAF (on 32-bit), continue our effort to keep the |
48 | * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock | 48 | * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock |
49 | * for that case too, and do both at once by combining the tests. | 49 | * for that case too, and do both at once by combining the tests. |
50 | * | 50 | * |
diff --git a/include/linux/clk.h b/include/linux/clk.h index fb5e097d8f72..afb44bfaf8d1 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h | |||
@@ -238,7 +238,7 @@ void clk_put(struct clk *clk); | |||
238 | 238 | ||
239 | /** | 239 | /** |
240 | * devm_clk_put - "free" a managed clock source | 240 | * devm_clk_put - "free" a managed clock source |
241 | * @dev: device used to acuqire the clock | 241 | * @dev: device used to acquire the clock |
242 | * @clk: clock source acquired with devm_clk_get() | 242 | * @clk: clock source acquired with devm_clk_get() |
243 | * | 243 | * |
244 | * Note: drivers must ensure that all clk_enable calls made on this | 244 | * Note: drivers must ensure that all clk_enable calls made on this |
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index e78a2373e374..c5e41da20112 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h | |||
@@ -105,7 +105,7 @@ struct gpio_chip { | |||
105 | 105 | ||
106 | #ifdef CONFIG_GPIOLIB_IRQCHIP | 106 | #ifdef CONFIG_GPIOLIB_IRQCHIP |
107 | /* | 107 | /* |
108 | * With CONFIG_GPIO_IRQCHIP we get an irqchip inside the gpiolib | 108 | * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib |
109 | * to handle IRQs for most practical cases. | 109 | * to handle IRQs for most practical cases. |
110 | */ | 110 | */ |
111 | struct irq_chip *irqchip; | 111 | struct irq_chip *irqchip; |
@@ -164,7 +164,7 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip, | |||
164 | irq_flow_handler_t handler, | 164 | irq_flow_handler_t handler, |
165 | unsigned int type); | 165 | unsigned int type); |
166 | 166 | ||
167 | #endif /* CONFIG_GPIO_IRQCHIP */ | 167 | #endif /* CONFIG_GPIOLIB_IRQCHIP */ |
168 | 168 | ||
169 | int gpiochip_request_own_desc(struct gpio_desc *desc, const char *label); | 169 | int gpiochip_request_own_desc(struct gpio_desc *desc, const char *label); |
170 | void gpiochip_free_own_desc(struct gpio_desc *desc); | 170 | void gpiochip_free_own_desc(struct gpio_desc *desc); |
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 554fde3a3927..473b43678ad1 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h | |||
@@ -722,7 +722,7 @@ __kfifo_uint_must_check_helper( \ | |||
722 | /** | 722 | /** |
723 | * kfifo_dma_out_finish - finish a DMA OUT operation | 723 | * kfifo_dma_out_finish - finish a DMA OUT operation |
724 | * @fifo: address of the fifo to be used | 724 | * @fifo: address of the fifo to be used |
725 | * @len: number of bytes transferrd | 725 | * @len: number of bytes transferred |
726 | * | 726 | * |
727 | * This macro finish a DMA OUT operation. The out counter will be updated by | 727 | * This macro finish a DMA OUT operation. The out counter will be updated by |
728 | * the len parameter. No error checking will be done. | 728 | * the len parameter. No error checking will be done. |
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 3df8c7db7a4e..5ba1813337df 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
@@ -96,7 +96,7 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | /* | 98 | /* |
99 | * The page cache can done in larger chunks than | 99 | * The page cache can be done in larger chunks than |
100 | * one page, because it allows for more efficient | 100 | * one page, because it allows for more efficient |
101 | * throughput (it can then be mapped into user | 101 | * throughput (it can then be mapped into user |
102 | * space in smaller chunks for same flexibility). | 102 | * space in smaller chunks for same flexibility). |
diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h index ef5894ca8e50..68a64f11ce02 100644 --- a/include/linux/percpu-refcount.h +++ b/include/linux/percpu-refcount.h | |||
@@ -29,7 +29,7 @@ | |||
29 | * calls io_destroy() or the process exits. | 29 | * calls io_destroy() or the process exits. |
30 | * | 30 | * |
31 | * In the aio code, kill_ioctx() is called when we wish to destroy a kioctx; it | 31 | * In the aio code, kill_ioctx() is called when we wish to destroy a kioctx; it |
32 | * calls percpu_ref_kill(), then hlist_del_rcu() and sychronize_rcu() to remove | 32 | * calls percpu_ref_kill(), then hlist_del_rcu() and synchronize_rcu() to remove |
33 | * the kioctx from the proccess's list of kioctxs - after that, there can't be | 33 | * the kioctx from the proccess's list of kioctxs - after that, there can't be |
34 | * any new users of the kioctx (from lookup_ioctx()) and it's then safe to drop | 34 | * any new users of the kioctx (from lookup_ioctx()) and it's then safe to drop |
35 | * the initial ref with percpu_ref_put(). | 35 | * the initial ref with percpu_ref_put(). |
diff --git a/init/do_mounts.c b/init/do_mounts.c index 82f22885c87e..9b3565c41502 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -182,7 +182,8 @@ done: | |||
182 | /* | 182 | /* |
183 | * Convert a name into device number. We accept the following variants: | 183 | * Convert a name into device number. We accept the following variants: |
184 | * | 184 | * |
185 | * 1) device number in hexadecimal represents itself | 185 | * 1) <hex_major><hex_minor> device number in hexadecimal represents itself |
186 | * no leading 0x, for example b302. | ||
186 | * 2) /dev/nfs represents Root_NFS (0xff) | 187 | * 2) /dev/nfs represents Root_NFS (0xff) |
187 | * 3) /dev/<disk_name> represents the device number of disk | 188 | * 3) /dev/<disk_name> represents the device number of disk |
188 | * 4) /dev/<disk_name><decimal> represents the device number | 189 | * 4) /dev/<disk_name><decimal> represents the device number |
diff --git a/ipc/util.c b/ipc/util.c index 27d74e69fd57..d73b7af581e2 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -309,7 +309,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size) | |||
309 | /** | 309 | /** |
310 | * ipcget_new - create a new ipc object | 310 | * ipcget_new - create a new ipc object |
311 | * @ns: ipc namespace | 311 | * @ns: ipc namespace |
312 | * @ids: ipc identifer set | 312 | * @ids: ipc identifier set |
313 | * @ops: the actual creation routine to call | 313 | * @ops: the actual creation routine to call |
314 | * @params: its parameters | 314 | * @params: its parameters |
315 | * | 315 | * |
@@ -363,7 +363,7 @@ static int ipc_check_perms(struct ipc_namespace *ns, | |||
363 | /** | 363 | /** |
364 | * ipcget_public - get an ipc object or create a new one | 364 | * ipcget_public - get an ipc object or create a new one |
365 | * @ns: ipc namespace | 365 | * @ns: ipc namespace |
366 | * @ids: ipc identifer set | 366 | * @ids: ipc identifier set |
367 | * @ops: the actual creation routine to call | 367 | * @ops: the actual creation routine to call |
368 | * @params: its parameters | 368 | * @params: its parameters |
369 | * | 369 | * |
@@ -669,7 +669,7 @@ out: | |||
669 | 669 | ||
670 | /** | 670 | /** |
671 | * ipcget - Common sys_*get() code | 671 | * ipcget - Common sys_*get() code |
672 | * @ns: namsepace | 672 | * @ns: namespace |
673 | * @ids: ipc identifier set | 673 | * @ids: ipc identifier set |
674 | * @ops: operations to be called on ipc object creation, permission checks | 674 | * @ops: operations to be called on ipc object creation, permission checks |
675 | * and further checks | 675 | * and further checks |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 21eae3c05ec0..7208c1df248d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -2406,7 +2406,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm, | |||
2406 | * @new: the new credentials | 2406 | * @new: the new credentials |
2407 | * @old: the old (current) credentials | 2407 | * @old: the old (current) credentials |
2408 | * | 2408 | * |
2409 | * Record the aguments userspace sent to sys_capset for later printing by the | 2409 | * Record the arguments userspace sent to sys_capset for later printing by the |
2410 | * audit system if applicable | 2410 | * audit system if applicable |
2411 | */ | 2411 | */ |
2412 | void __audit_log_capset(const struct cred *new, const struct cred *old) | 2412 | void __audit_log_capset(const struct cred *new, const struct cred *old) |
diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index 1ef0606797c9..d5d0f7345c54 100644 --- a/kernel/irq/devres.c +++ b/kernel/irq/devres.c | |||
@@ -38,7 +38,7 @@ static int devm_irq_match(struct device *dev, void *res, void *data) | |||
38 | * | 38 | * |
39 | * Except for the extra @dev argument, this function takes the | 39 | * Except for the extra @dev argument, this function takes the |
40 | * same arguments and performs the same function as | 40 | * same arguments and performs the same function as |
41 | * request_irq(). IRQs requested with this function will be | 41 | * request_threaded_irq(). IRQs requested with this function will be |
42 | * automatically freed on driver detach. | 42 | * automatically freed on driver detach. |
43 | * | 43 | * |
44 | * If an IRQ allocated with this function needs to be freed | 44 | * If an IRQ allocated with this function needs to be freed |
diff --git a/lib/bitmap.c b/lib/bitmap.c index 1e031f2c9aba..cd250a2e14cb 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
@@ -884,7 +884,7 @@ EXPORT_SYMBOL(bitmap_bitremap); | |||
884 | * read it, you're overqualified for your current job.) | 884 | * read it, you're overqualified for your current job.) |
885 | * | 885 | * |
886 | * In other words, @orig is mapped onto (surjectively) @dst, | 886 | * In other words, @orig is mapped onto (surjectively) @dst, |
887 | * using the the map { <n, m> | the n-th bit of @relmap is the | 887 | * using the map { <n, m> | the n-th bit of @relmap is the |
888 | * m-th set bit of @relmap }. | 888 | * m-th set bit of @relmap }. |
889 | * | 889 | * |
890 | * Any set bits in @orig above bit number W, where W is the | 890 | * Any set bits in @orig above bit number W, where W is the |
@@ -932,7 +932,7 @@ EXPORT_SYMBOL(bitmap_bitremap); | |||
932 | * | 932 | * |
933 | * Further lets say we use the following code, invoking | 933 | * Further lets say we use the following code, invoking |
934 | * bitmap_fold() then bitmap_onto, as suggested above to | 934 | * bitmap_fold() then bitmap_onto, as suggested above to |
935 | * avoid the possitility of an empty @dst result: | 935 | * avoid the possibility of an empty @dst result: |
936 | * | 936 | * |
937 | * unsigned long *tmp; // a temporary bitmap's bits | 937 | * unsigned long *tmp; // a temporary bitmap's bits |
938 | * | 938 | * |
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 98f2d7e91a91..add80cc02dbe 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -1149,7 +1149,7 @@ static void check_unmap(struct dma_debug_entry *ref) | |||
1149 | static void check_for_stack(struct device *dev, void *addr) | 1149 | static void check_for_stack(struct device *dev, void *addr) |
1150 | { | 1150 | { |
1151 | if (object_is_on_stack(addr)) | 1151 | if (object_is_on_stack(addr)) |
1152 | err_printk(dev, NULL, "DMA-API: device driver maps memory from" | 1152 | err_printk(dev, NULL, "DMA-API: device driver maps memory from " |
1153 | "stack [addr=%p]\n", addr); | 1153 | "stack [addr=%p]\n", addr); |
1154 | } | 1154 | } |
1155 | 1155 | ||
@@ -626,7 +626,7 @@ static void __idr_remove_all(struct idr *idp) | |||
626 | * idr_destroy(). | 626 | * idr_destroy(). |
627 | * | 627 | * |
628 | * A typical clean-up sequence for objects stored in an idr tree will use | 628 | * A typical clean-up sequence for objects stored in an idr tree will use |
629 | * idr_for_each() to free all objects, if necessay, then idr_destroy() to | 629 | * idr_for_each() to free all objects, if necessary, then idr_destroy() to |
630 | * free up the id mappings and cached idr_layers. | 630 | * free up the id mappings and cached idr_layers. |
631 | */ | 631 | */ |
632 | void idr_destroy(struct idr *idp) | 632 | void idr_destroy(struct idr *idp) |
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 16d02639d334..3d2b4733f6cb 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c | |||
@@ -54,7 +54,7 @@ static u32 __hashfn(const struct rhashtable *ht, const void *key, | |||
54 | 54 | ||
55 | /** | 55 | /** |
56 | * rhashtable_hashfn - compute hash for key of given length | 56 | * rhashtable_hashfn - compute hash for key of given length |
57 | * @ht: hash table to compuate for | 57 | * @ht: hash table to compute for |
58 | * @key: pointer to key | 58 | * @key: pointer to key |
59 | * @len: length of key | 59 | * @len: length of key |
60 | * | 60 | * |
@@ -85,7 +85,7 @@ static u32 obj_hashfn(const struct rhashtable *ht, const void *ptr, u32 hsize) | |||
85 | 85 | ||
86 | /** | 86 | /** |
87 | * rhashtable_obj_hashfn - compute hash for hashed object | 87 | * rhashtable_obj_hashfn - compute hash for hashed object |
88 | * @ht: hash table to compuate for | 88 | * @ht: hash table to compute for |
89 | * @ptr: pointer to hashed object | 89 | * @ptr: pointer to hashed object |
90 | * | 90 | * |
91 | * Computes the hash value using the hash function `hashfn` respectively | 91 | * Computes the hash value using the hash function `hashfn` respectively |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 6fe2c84eb055..ba3cd0a35640 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -1937,7 +1937,7 @@ EXPORT_SYMBOL(sprintf); | |||
1937 | * @args: Arguments for the format string | 1937 | * @args: Arguments for the format string |
1938 | * | 1938 | * |
1939 | * The format follows C99 vsnprintf, except %n is ignored, and its argument | 1939 | * The format follows C99 vsnprintf, except %n is ignored, and its argument |
1940 | * is skiped. | 1940 | * is skipped. |
1941 | * | 1941 | * |
1942 | * The return value is the number of words(32bits) which would be generated for | 1942 | * The return value is the number of words(32bits) which would be generated for |
1943 | * the given input. | 1943 | * the given input. |
diff --git a/mm/filemap.c b/mm/filemap.c index 90effcdf948d..8554d20b3523 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -727,7 +727,7 @@ EXPORT_SYMBOL_GPL(add_page_wait_queue); | |||
727 | * | 727 | * |
728 | * Unlocks the page and wakes up sleepers in ___wait_on_page_locked(). | 728 | * Unlocks the page and wakes up sleepers in ___wait_on_page_locked(). |
729 | * Also wakes sleepers in wait_on_page_writeback() because the wakeup | 729 | * Also wakes sleepers in wait_on_page_writeback() because the wakeup |
730 | * mechananism between PageLocked pages and PageWriteback pages is shared. | 730 | * mechanism between PageLocked pages and PageWriteback pages is shared. |
731 | * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep. | 731 | * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep. |
732 | * | 732 | * |
733 | * The mb is necessary to enforce ordering between the clear_bit and the read | 733 | * The mb is necessary to enforce ordering between the clear_bit and the read |
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c index 547838822d5e..d593500ceb3c 100644 --- a/net/mac802154/wpan.c +++ b/net/mac802154/wpan.c | |||
@@ -90,7 +90,7 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
90 | } | 90 | } |
91 | case SIOCSIFADDR: | 91 | case SIOCSIFADDR: |
92 | dev_warn(&dev->dev, | 92 | dev_warn(&dev->dev, |
93 | "Using DEBUGing ioctl SIOCSIFADDR isn't recommened!\n"); | 93 | "Using DEBUGing ioctl SIOCSIFADDR isn't recommended!\n"); |
94 | if (sa->family != AF_IEEE802154 || | 94 | if (sa->family != AF_IEEE802154 || |
95 | sa->addr.addr_type != IEEE802154_ADDR_SHORT || | 95 | sa->addr.addr_type != IEEE802154_ADDR_SHORT || |
96 | sa->addr.pan_id == IEEE802154_PANID_BROADCAST || | 96 | sa->addr.pan_id == IEEE802154_PANID_BROADCAST || |
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index ec8114fae50b..5edbbe829495 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c | |||
@@ -478,7 +478,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb, | |||
478 | 478 | ||
479 | if (ret == -EAGAIN) { | 479 | if (ret == -EAGAIN) { |
480 | /* Type requests element to be completed */ | 480 | /* Type requests element to be completed */ |
481 | pr_debug("element must be competed, ADD is triggered\n"); | 481 | pr_debug("element must be completed, ADD is triggered\n"); |
482 | write_lock_bh(&set->lock); | 482 | write_lock_bh(&set->lock); |
483 | set->variant->kadt(set, skb, par, IPSET_ADD, opt); | 483 | set->variant->kadt(set, skb, par, IPSET_ADD, opt); |
484 | write_unlock_bh(&set->lock); | 484 | write_unlock_bh(&set->lock); |
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 424ff622ab5f..10443377fb9d 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c | |||
@@ -83,7 +83,7 @@ static int rds_release(struct socket *sock) | |||
83 | 83 | ||
84 | /* | 84 | /* |
85 | * the binding lookup hash uses rcu, we need to | 85 | * the binding lookup hash uses rcu, we need to |
86 | * make sure we sychronize_rcu before we free our | 86 | * make sure we synchronize_rcu before we free our |
87 | * entry | 87 | * entry |
88 | */ | 88 | */ |
89 | rds_remove_bound(rs); | 89 | rds_remove_bound(rs); |
diff --git a/samples/kprobes/jprobe_example.c b/samples/kprobes/jprobe_example.c index b7541355b92b..9119ac6a8270 100644 --- a/samples/kprobes/jprobe_example.c +++ b/samples/kprobes/jprobe_example.c | |||
@@ -24,12 +24,11 @@ | |||
24 | 24 | ||
25 | /* Proxy routine having the same arguments as actual do_fork() routine */ | 25 | /* Proxy routine having the same arguments as actual do_fork() routine */ |
26 | static long jdo_fork(unsigned long clone_flags, unsigned long stack_start, | 26 | static long jdo_fork(unsigned long clone_flags, unsigned long stack_start, |
27 | struct pt_regs *regs, unsigned long stack_size, | 27 | unsigned long stack_size, int __user *parent_tidptr, |
28 | int __user *parent_tidptr, int __user *child_tidptr) | 28 | int __user *child_tidptr) |
29 | { | 29 | { |
30 | printk(KERN_INFO "jprobe: clone_flags = 0x%lx, stack_size = 0x%lx," | 30 | pr_info("jprobe: clone_flags = 0x%lx, stack_start = 0x%lx " |
31 | " regs = 0x%p\n", | 31 | "stack_size = 0x%lx\n", clone_flags, stack_start, stack_size); |
32 | clone_flags, stack_size, regs); | ||
33 | 32 | ||
34 | /* Always end with a call to jprobe_return(). */ | 33 | /* Always end with a call to jprobe_return(). */ |
35 | jprobe_return(); | 34 | jprobe_return(); |
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl index 899b4230320e..dd8397894d5c 100755 --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl | |||
@@ -13,7 +13,7 @@ | |||
13 | # Random bits by Matt Mackall <mpm@selenic.com> | 13 | # Random bits by Matt Mackall <mpm@selenic.com> |
14 | # M68k port by Geert Uytterhoeven and Andreas Schwab | 14 | # M68k port by Geert Uytterhoeven and Andreas Schwab |
15 | # AVR32 port by Haavard Skinnemoen (Atmel) | 15 | # AVR32 port by Haavard Skinnemoen (Atmel) |
16 | # PARISC port by Kyle McMartin <kyle@parisc-linux.org> | 16 | # AArch64, PARISC ports by Kyle McMartin |
17 | # sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk> | 17 | # sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk> |
18 | # | 18 | # |
19 | # Usage: | 19 | # Usage: |
@@ -45,7 +45,10 @@ my (@stack, $re, $dre, $x, $xs, $funcre); | |||
45 | $x = "[0-9a-f]"; # hex character | 45 | $x = "[0-9a-f]"; # hex character |
46 | $xs = "[0-9a-f ]"; # hex character or space | 46 | $xs = "[0-9a-f ]"; # hex character or space |
47 | $funcre = qr/^$x* <(.*)>:$/; | 47 | $funcre = qr/^$x* <(.*)>:$/; |
48 | if ($arch eq 'arm') { | 48 | if ($arch eq 'aarch64') { |
49 | #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp,#-80]! | ||
50 | $re = qr/^.*stp.*sp,\#-([0-9]{1,8})\]\!/o; | ||
51 | } elsif ($arch eq 'arm') { | ||
49 | #c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64 | 52 | #c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64 |
50 | $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o; | 53 | $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o; |
51 | } elsif ($arch eq 'avr32') { | 54 | } elsif ($arch eq 'avr32') { |
diff --git a/scripts/sign-file b/scripts/sign-file index 2b7c4484d46c..3906ee1e2f76 100755 --- a/scripts/sign-file +++ b/scripts/sign-file | |||
@@ -398,7 +398,7 @@ if ($verbose) { | |||
398 | print "Size of signer's name : ", length($signers_name), "\n"; | 398 | print "Size of signer's name : ", length($signers_name), "\n"; |
399 | print "Size of key identifier : ", length($key_identifier), "\n"; | 399 | print "Size of key identifier : ", length($key_identifier), "\n"; |
400 | print "Size of signature : ", length($signature), "\n"; | 400 | print "Size of signature : ", length($signature), "\n"; |
401 | print "Size of informaton : ", length($info), "\n"; | 401 | print "Size of information : ", length($info), "\n"; |
402 | print "Size of magic number : ", length($magic_number), "\n"; | 402 | print "Size of magic number : ", length($magic_number), "\n"; |
403 | print "Signer's name : '", $signers_name, "'\n"; | 403 | print "Signer's name : '", $signers_name, "'\n"; |
404 | print "Digest : $dgst\n"; | 404 | print "Digest : $dgst\n"; |
diff --git a/security/inode.c b/security/inode.c index 43ce6e19015f..8e7ca62078ab 100644 --- a/security/inode.c +++ b/security/inode.c | |||
@@ -74,7 +74,7 @@ static struct file_system_type fs_type = { | |||
74 | * pointer must be passed to the securityfs_remove() function when the file is | 74 | * pointer must be passed to the securityfs_remove() function when the file is |
75 | * to be removed (no automatic cleanup happens if your module is unloaded, | 75 | * to be removed (no automatic cleanup happens if your module is unloaded, |
76 | * you are responsible here). If an error occurs, the function will return | 76 | * you are responsible here). If an error occurs, the function will return |
77 | * the erorr value (via ERR_PTR). | 77 | * the error value (via ERR_PTR). |
78 | * | 78 | * |
79 | * If securityfs is not enabled in the kernel, the value %-ENODEV is | 79 | * If securityfs is not enabled in the kernel, the value %-ENODEV is |
80 | * returned. | 80 | * returned. |