aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 12:36:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 12:36:28 -0400
commit2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch)
tree8ce40f811092844ea9da683804db6e2afa410808
parent22e04f6b4b04a8afe9af9239224591d06ba3b24d (diff)
parentf8ea61e63442c25cbe6ddee48979b444f1f2a01c (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "The usual trivial updates all over the tree -- mostly typo fixes and documentation updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits) doc: Documentation/cputopology.txt fix typo treewide: Convert retrun typos to return Fix comment typo for init_cma_reserved_pageblock Documentation/trace: Correcting and extending tracepoint documentation mm/hotplug: fix a typo in Documentation/memory-hotplug.txt power: Documentation: Update s2ram link doc: fix a typo in Documentation/00-INDEX Documentation/printk-formats.txt: No casts needed for u64/s64 doc: Fix typo "is is" in Documentations treewide: Fix printks with 0x%# zram: doc fixes Documentation/kmemcheck: update kmemcheck documentation doc: documentation/hwspinlock.txt fix typo PM / Hibernate: add section for resume options doc: filesystems : Fix typo in Documentations/filesystems scsi/megaraid fixed several typos in comments ppc: init_32: Fix error typo "CONFIG_START_KERNEL" treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks page_isolation: Fix a comment typo in test_pages_isolated() doc: fix a typo about irq affinity ...
-rw-r--r--CREDITS11
-rw-r--r--Documentation/00-INDEX2
-rw-r--r--Documentation/ABI/testing/sysfs-block-zram9
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-g-parm.xml4
-rw-r--r--Documentation/IRQ-affinity.txt4
-rw-r--r--Documentation/SubmittingPatches10
-rw-r--r--Documentation/acpi/enumeration.txt2
-rw-r--r--Documentation/arm/OMAP/omap_pm2
-rw-r--r--Documentation/block/cfq-iosched.txt2
-rw-r--r--Documentation/cachetlb.txt6
-rw-r--r--Documentation/cputopology.txt2
-rw-r--r--Documentation/development-process/2.Process4
-rw-r--r--Documentation/devicetree/bindings/arm/ste-u300.txt2
-rw-r--r--Documentation/devicetree/bindings/arm/vexpress-sysreg.txt4
-rw-r--r--Documentation/devicetree/bindings/c6x/dscr.txt2
-rw-r--r--Documentation/devicetree/bindings/clock/clk-exynos-audss.txt2
-rw-r--r--Documentation/devicetree/bindings/clock/st,nomadik.txt2
-rw-r--r--Documentation/devicetree/bindings/dma/atmel-dma.txt4
-rw-r--r--Documentation/devicetree/bindings/dma/fsl-imx-dma.txt2
-rw-r--r--Documentation/devicetree/bindings/dma/ste-dma40.txt4
-rw-r--r--Documentation/devicetree/bindings/mfd/cros-ec.txt2
-rw-r--r--Documentation/devicetree/bindings/net/can/atmel-can.txt2
-rw-r--r--Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt2
-rw-r--r--Documentation/devicetree/bindings/serial/rs485.txt2
-rw-r--r--Documentation/dma-buf-sharing.txt2
-rw-r--r--Documentation/early-userspace/README3
-rw-r--r--Documentation/fb/fbcon.txt2
-rw-r--r--Documentation/fb/viafb.modes2
-rw-r--r--Documentation/fb/viafb.txt2
-rw-r--r--Documentation/filesystems/btrfs.txt2
-rw-r--r--Documentation/filesystems/ext4.txt2
-rw-r--r--Documentation/filesystems/nfs/Exporting2
-rw-r--r--Documentation/filesystems/nfs/pnfs.txt2
-rw-r--r--Documentation/filesystems/qnx6.txt2
-rw-r--r--Documentation/filesystems/relay.txt2
-rw-r--r--Documentation/filesystems/sysfs-tagging.txt2
-rw-r--r--Documentation/filesystems/xfs.txt2
-rw-r--r--Documentation/fmc/carrier.txt2
-rw-r--r--Documentation/hwmon/abituguru-datasheet2
-rw-r--r--Documentation/hwmon/submitting-patches2
-rw-r--r--Documentation/hwspinlock.txt2
-rw-r--r--Documentation/i2c/upgrading-clients4
-rw-r--r--Documentation/kmemcheck.txt6
-rw-r--r--Documentation/leds/leds-lm3556.txt2
-rw-r--r--Documentation/leds/leds-lp3944.txt2
-rw-r--r--Documentation/memory-hotplug.txt2
-rw-r--r--Documentation/mtd/nand_ecc.txt2
-rw-r--r--Documentation/power/basic-pm-debugging.txt10
-rw-r--r--Documentation/power/swsusp.txt15
-rw-r--r--Documentation/printk-formats.txt6
-rw-r--r--Documentation/rapidio/rapidio.txt2
-rw-r--r--Documentation/scsi/hptiop.txt2
-rw-r--r--Documentation/sound/alsa/README.maya442
-rw-r--r--Documentation/sound/alsa/compress_offload.txt4
-rw-r--r--Documentation/sysfs-rules.txt2
-rwxr-xr-xDocumentation/target/tcm_mod_builder.py2
-rw-r--r--Documentation/trace/ftrace.txt4
-rw-r--r--Documentation/trace/tracepoints.txt19
-rw-r--r--Documentation/virtual/kvm/api.txt2
-rw-r--r--Documentation/x86/boot.txt2
-rw-r--r--Documentation/zh_CN/SubmittingPatches2
-rw-r--r--arch/parisc/kernel/signal.c2
-rw-r--r--arch/powerpc/mm/init_32.c2
-rw-r--r--crypto/api.c2
-rw-r--r--drivers/block/drbd/drbd_bitmap.c2
-rw-r--r--drivers/clocksource/acpi_pm.c4
-rw-r--r--drivers/crypto/ux500/hash/hash_core.c2
-rw-r--r--drivers/gpu/drm/radeon/r300.c2
-rw-r--r--drivers/infiniband/hw/ehca/ipz_pt_fn.c3
-rw-r--r--drivers/media/usb/gspca/vicam.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c2
-rw-r--r--drivers/net/ethernet/sis/sis900.c2
-rw-r--r--drivers/net/wireless/cw1200/wsm.c2
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/time-event.c2
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8188ee/fw.c4
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192de/dm.c2
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8723ae/fw.c4
-rw-r--r--drivers/power/88pm860x_charger.c4
-rw-r--r--drivers/power/pm2301_charger.c2
-rw-r--r--drivers/scsi/bfa/bfad_im.c2
-rw-r--r--drivers/scsi/cxgbi/libcxgbi.h8
-rw-r--r--drivers/scsi/hpsa.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_attr.c8
-rw-r--r--drivers/scsi/lpfc/lpfc_bsg.c2
-rw-r--r--drivers/scsi/megaraid/megaraid_mbox.c10
-rw-r--r--drivers/scsi/megaraid/megaraid_mm.c2
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_bsg.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.c2
-rw-r--r--drivers/spi/spi-bitbang.c2
-rw-r--r--drivers/tty/serial/kgdboc.c2
-rw-r--r--fs/btrfs/send.c2
-rw-r--r--fs/ext4/super.c4
-rw-r--r--fs/gfs2/dir.c2
-rw-r--r--include/linux/coda.h1
-rw-r--r--include/linux/ktime.h28
-rw-r--r--kernel/workqueue.c107
-rw-r--r--mm/memory-failure.c2
-rw-r--r--mm/page_alloc.c2
-rw-r--r--mm/page_isolation.c8
-rw-r--r--net/sched/sch_choke.c3
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/via82xx.c2
106 files changed, 269 insertions, 204 deletions
diff --git a/CREDITS b/CREDITS
index 646a0a9ad6d1..9416a9a8b95e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096
637S: Bellevue, Washington 98007 637S: Bellevue, Washington 98007
638S: USA 638S: USA
639 639
640N: Christopher L. Cheney 640N: Chris Cheney
641E: ccheney@debian.org 641E: chris.cheney@gmail.com
642E: ccheney@cheney.cx 642E: ccheney@redhat.com
643W: http://www.cheney.cx
644P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2 643P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2
645D: Vista Imaging usb webcam driver 644D: Vista Imaging usb webcam driver
646S: 314 Prince of Wales 645S: 2308 Therrell Way
647S: Conroe, TX 77304 646S: McKinney, TX 75070
648S: USA 647S: USA
649 648
650N: Stuart Cheshire 649N: Stuart Cheshire
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 0c4cc688e89a..38f8444bdd0e 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -40,7 +40,7 @@ IPMI.txt
40IRQ-affinity.txt 40IRQ-affinity.txt
41 - how to select which CPU(s) handle which interrupt events on SMP. 41 - how to select which CPU(s) handle which interrupt events on SMP.
42IRQ-domain.txt 42IRQ-domain.txt
43 - info on inerrupt numbering and setting up IRQ domains. 43 - info on interrupt numbering and setting up IRQ domains.
44IRQ.txt 44IRQ.txt
45 - description of what an IRQ is. 45 - description of what an IRQ is.
46Intel-IOMMU.txt 46Intel-IOMMU.txt
diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram
index ec93fe33baa6..3f0b9ae61d8c 100644
--- a/Documentation/ABI/testing/sysfs-block-zram
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -5,20 +5,21 @@ Description:
5 The disksize file is read-write and specifies the disk size 5 The disksize file is read-write and specifies the disk size
6 which represents the limit on the *uncompressed* worth of data 6 which represents the limit on the *uncompressed* worth of data
7 that can be stored in this disk. 7 that can be stored in this disk.
8 Unit: bytes
8 9
9What: /sys/block/zram<id>/initstate 10What: /sys/block/zram<id>/initstate
10Date: August 2010 11Date: August 2010
11Contact: Nitin Gupta <ngupta@vflare.org> 12Contact: Nitin Gupta <ngupta@vflare.org>
12Description: 13Description:
13 The disksize file is read-only and shows the initialization 14 The initstate file is read-only and shows the initialization
14 state of the device. 15 state of the device.
15 16
16What: /sys/block/zram<id>/reset 17What: /sys/block/zram<id>/reset
17Date: August 2010 18Date: August 2010
18Contact: Nitin Gupta <ngupta@vflare.org> 19Contact: Nitin Gupta <ngupta@vflare.org>
19Description: 20Description:
20 The disksize file is write-only and allows resetting the 21 The reset file is write-only and allows resetting the
21 device. The reset operation frees all the memory assocaited 22 device. The reset operation frees all the memory associated
22 with this device. 23 with this device.
23 24
24What: /sys/block/zram<id>/num_reads 25What: /sys/block/zram<id>/num_reads
@@ -48,7 +49,7 @@ Contact: Nitin Gupta <ngupta@vflare.org>
48Description: 49Description:
49 The notify_free file is read-only and specifies the number of 50 The notify_free file is read-only and specifies the number of
50 swap slot free notifications received by this device. These 51 swap slot free notifications received by this device. These
51 notifications are send to a swap block device when a swap slot 52 notifications are sent to a swap block device when a swap slot
52 is freed. This statistic is applicable only when this disk is 53 is freed. This statistic is applicable only when this disk is
53 being used as a swap disk. 54 being used as a swap disk.
54 55
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
index 9058224d1bbf..f4e28e7d4751 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
@@ -132,7 +132,7 @@ devices.</para>
132 <row> 132 <row>
133 <entry>&v4l2-fract;</entry> 133 <entry>&v4l2-fract;</entry>
134 <entry><structfield>timeperframe</structfield></entry> 134 <entry><structfield>timeperframe</structfield></entry>
135 <entry><para>This is is the desired period between 135 <entry><para>This is the desired period between
136successive frames captured by the driver, in seconds. The 136successive frames captured by the driver, in seconds. The
137field is intended to skip frames on the driver side, saving I/O 137field is intended to skip frames on the driver side, saving I/O
138bandwidth.</para><para>Applications store here the desired frame 138bandwidth.</para><para>Applications store here the desired frame
@@ -193,7 +193,7 @@ applications must set the array to zero.</entry>
193 <row> 193 <row>
194 <entry>&v4l2-fract;</entry> 194 <entry>&v4l2-fract;</entry>
195 <entry><structfield>timeperframe</structfield></entry> 195 <entry><structfield>timeperframe</structfield></entry>
196 <entry>This is is the desired period between 196 <entry>This is the desired period between
197successive frames output by the driver, in seconds.</entry> 197successive frames output by the driver, in seconds.</entry>
198 </row> 198 </row>
199 <row> 199 <row>
diff --git a/Documentation/IRQ-affinity.txt b/Documentation/IRQ-affinity.txt
index 7890fae18529..01a675175a36 100644
--- a/Documentation/IRQ-affinity.txt
+++ b/Documentation/IRQ-affinity.txt
@@ -57,8 +57,8 @@ i.e counters for the CPU0-3 did not change.
57 57
58Here is an example of limiting that same irq (44) to cpus 1024 to 1031: 58Here is an example of limiting that same irq (44) to cpus 1024 to 1031:
59 59
60[root@moon 44]# echo 1024-1031 > smp_affinity 60[root@moon 44]# echo 1024-1031 > smp_affinity_list
61[root@moon 44]# cat smp_affinity 61[root@moon 44]# cat smp_affinity_list
621024-1031 621024-1031
63 63
64Note that to do this with a bitmask would require 32 bitmasks of zero 64Note that to do this with a bitmask would require 32 bitmasks of zero
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 6e97e73d87b5..26b1e31d5a13 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -109,6 +109,16 @@ probably didn't even receive earlier versions of the patch.
109If the patch fixes a logged bug entry, refer to that bug entry by 109If the patch fixes a logged bug entry, refer to that bug entry by
110number and URL. 110number and URL.
111 111
112If you want to refer to a specific commit, don't just refer to the
113SHA-1 ID of the commit. Please also include the oneline summary of
114the commit, to make it easier for reviewers to know what it is about.
115Example:
116
117 Commit e21d2170f36602ae2708 ("video: remove unnecessary
118 platform_set_drvdata()") removed the unnecessary
119 platform_set_drvdata(), but left the variable "dev" unused,
120 delete it.
121
112 122
1133) Separate your changes. 1233) Separate your changes.
114 124
diff --git a/Documentation/acpi/enumeration.txt b/Documentation/acpi/enumeration.txt
index d977778b5e67..aca4e69121b7 100644
--- a/Documentation/acpi/enumeration.txt
+++ b/Documentation/acpi/enumeration.txt
@@ -207,7 +207,7 @@ passing those. One idea is to return this in _DSM method like:
207 Return (Local0) 207 Return (Local0)
208 } 208 }
209 209
210Then the at25 SPI driver can get this configation by calling _DSM on its 210Then the at25 SPI driver can get this configuration by calling _DSM on its
211ACPI handle like: 211ACPI handle like:
212 212
213 struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; 213 struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
diff --git a/Documentation/arm/OMAP/omap_pm b/Documentation/arm/OMAP/omap_pm
index 9012bb039094..4ae915a9f899 100644
--- a/Documentation/arm/OMAP/omap_pm
+++ b/Documentation/arm/OMAP/omap_pm
@@ -78,7 +78,7 @@ to NULL. Drivers should use the following idiom:
78The most common usage of these functions will probably be to specify 78The most common usage of these functions will probably be to specify
79the maximum time from when an interrupt occurs, to when the device 79the maximum time from when an interrupt occurs, to when the device
80becomes accessible. To accomplish this, driver writers should use the 80becomes accessible. To accomplish this, driver writers should use the
81set_max_mpu_wakeup_lat() function to to constrain the MPU wakeup 81set_max_mpu_wakeup_lat() function to constrain the MPU wakeup
82latency, and the set_max_dev_wakeup_lat() function to constrain the 82latency, and the set_max_dev_wakeup_lat() function to constrain the
83device wakeup latency (from clk_enable() to accessibility). For 83device wakeup latency (from clk_enable() to accessibility). For
84example, 84example,
diff --git a/Documentation/block/cfq-iosched.txt b/Documentation/block/cfq-iosched.txt
index 9887f0414c16..f3bc72945cbd 100644
--- a/Documentation/block/cfq-iosched.txt
+++ b/Documentation/block/cfq-iosched.txt
@@ -69,7 +69,7 @@ one, this value should be decreased relative to fifo_expire_async.
69group_idle 69group_idle
70----------- 70-----------
71This parameter forces idling at the CFQ group level instead of CFQ 71This parameter forces idling at the CFQ group level instead of CFQ
72queue level. This was introduced after after a bottleneck was observed 72queue level. This was introduced after a bottleneck was observed
73in higher end storage due to idle on sequential queue and allow dispatch 73in higher end storage due to idle on sequential queue and allow dispatch
74from a single queue. The idea with this parameter is that it can be run with 74from a single queue. The idea with this parameter is that it can be run with
75slice_idle=0 and group_idle=8, so that idling does not happen on individual 75slice_idle=0 and group_idle=8, so that idling does not happen on individual
diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt
index 9b728dc17535..d79b008e4a32 100644
--- a/Documentation/cachetlb.txt
+++ b/Documentation/cachetlb.txt
@@ -57,7 +57,7 @@ changes occur:
57 interface must make sure that any previous page table 57 interface must make sure that any previous page table
58 modifications for the address space 'vma->vm_mm' in the range 58 modifications for the address space 'vma->vm_mm' in the range
59 'start' to 'end-1' will be visible to the cpu. That is, after 59 'start' to 'end-1' will be visible to the cpu. That is, after
60 running, here will be no entries in the TLB for 'mm' for 60 running, there will be no entries in the TLB for 'mm' for
61 virtual addresses in the range 'start' to 'end-1'. 61 virtual addresses in the range 'start' to 'end-1'.
62 62
63 The "vma" is the backing store being used for the region. 63 The "vma" is the backing store being used for the region.
@@ -375,8 +375,8 @@ maps this page at its virtual address.
375 375
376 void flush_icache_page(struct vm_area_struct *vma, struct page *page) 376 void flush_icache_page(struct vm_area_struct *vma, struct page *page)
377 All the functionality of flush_icache_page can be implemented in 377 All the functionality of flush_icache_page can be implemented in
378 flush_dcache_page and update_mmu_cache. In 2.7 the hope is to 378 flush_dcache_page and update_mmu_cache. In the future, the hope
379 remove this interface completely. 379 is to remove this interface completely.
380 380
381The final category of APIs is for I/O to deliberately aliased address 381The final category of APIs is for I/O to deliberately aliased address
382ranges inside the kernel. Such aliases are set up by use of the 382ranges inside the kernel. Such aliases are set up by use of the
diff --git a/Documentation/cputopology.txt b/Documentation/cputopology.txt
index 902d3151f527..0aad6deb2d96 100644
--- a/Documentation/cputopology.txt
+++ b/Documentation/cputopology.txt
@@ -22,7 +22,7 @@ to /proc/cpuinfo.
22 22
234) /sys/devices/system/cpu/cpuX/topology/thread_siblings: 234) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
24 24
25 internel kernel map of cpuX's hardware threads within the same 25 internal kernel map of cpuX's hardware threads within the same
26 core as cpuX 26 core as cpuX
27 27
285) /sys/devices/system/cpu/cpuX/topology/core_siblings: 285) /sys/devices/system/cpu/cpuX/topology/core_siblings:
diff --git a/Documentation/development-process/2.Process b/Documentation/development-process/2.Process
index 4823577c6509..2e0617936e8f 100644
--- a/Documentation/development-process/2.Process
+++ b/Documentation/development-process/2.Process
@@ -276,7 +276,7 @@ mainline get there via -mm.
276The current -mm patch is available in the "mmotm" (-mm of the moment) 276The current -mm patch is available in the "mmotm" (-mm of the moment)
277directory at: 277directory at:
278 278
279 http://userweb.kernel.org/~akpm/mmotm/ 279 http://www.ozlabs.org/~akpm/mmotm/
280 280
281Use of the MMOTM tree is likely to be a frustrating experience, though; 281Use of the MMOTM tree is likely to be a frustrating experience, though;
282there is a definite chance that it will not even compile. 282there is a definite chance that it will not even compile.
@@ -287,7 +287,7 @@ the mainline is expected to look like after the next merge window closes.
287Linux-next trees are announced on the linux-kernel and linux-next mailing 287Linux-next trees are announced on the linux-kernel and linux-next mailing
288lists when they are assembled; they can be downloaded from: 288lists when they are assembled; they can be downloaded from:
289 289
290 http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/ 290 http://www.kernel.org/pub/linux/kernel/next/
291 291
292Some information about linux-next has been gathered at: 292Some information about linux-next has been gathered at:
293 293
diff --git a/Documentation/devicetree/bindings/arm/ste-u300.txt b/Documentation/devicetree/bindings/arm/ste-u300.txt
index 69b5ab0b5f4b..d11d80006a19 100644
--- a/Documentation/devicetree/bindings/arm/ste-u300.txt
+++ b/Documentation/devicetree/bindings/arm/ste-u300.txt
@@ -22,7 +22,7 @@ This contains the board-specific information.
22- compatible: must be "stericsson,s365". 22- compatible: must be "stericsson,s365".
23- vana15-supply: the regulator supplying the 1.5V to drive the 23- vana15-supply: the regulator supplying the 1.5V to drive the
24 board. 24 board.
25- syscon: a pointer to the syscon node so we can acccess the 25- syscon: a pointer to the syscon node so we can access the
26 syscon registers to set the board as self-powered. 26 syscon registers to set the board as self-powered.
27 27
28Example: 28Example:
diff --git a/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt b/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
index 9cf3f25544c7..5580e9c4bd85 100644
--- a/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
+++ b/Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
@@ -32,8 +32,8 @@ numbers - see motherboard's TRM for more details.
32The node describing a config device must refer to the sysreg node via 32The node describing a config device must refer to the sysreg node via
33"arm,vexpress,config-bridge" phandle (can be also defined in the node's 33"arm,vexpress,config-bridge" phandle (can be also defined in the node's
34parent) and relies on the board topology properties - see main vexpress 34parent) and relies on the board topology properties - see main vexpress
35node documentation for more details. It must must also define the 35node documentation for more details. It must also define the following
36following property: 36property:
37- arm,vexpress-sysreg,func : must contain two cells: 37- arm,vexpress-sysreg,func : must contain two cells:
38 - first cell defines function number (eg. 1 for clock generator, 38 - first cell defines function number (eg. 1 for clock generator,
39 2 for voltage regulators etc.) 39 2 for voltage regulators etc.)
diff --git a/Documentation/devicetree/bindings/c6x/dscr.txt b/Documentation/devicetree/bindings/c6x/dscr.txt
index d847758f2b20..b0e97144cfb1 100644
--- a/Documentation/devicetree/bindings/c6x/dscr.txt
+++ b/Documentation/devicetree/bindings/c6x/dscr.txt
@@ -5,7 +5,7 @@ TI C6X SoCs contain a region of miscellaneous registers which provide various
5function for SoC control or status. Details vary considerably among from SoC 5function for SoC control or status. Details vary considerably among from SoC
6to SoC with no two being alike. 6to SoC with no two being alike.
7 7
8In general, the Device State Configuraion Registers (DSCR) will provide one or 8In general, the Device State Configuration Registers (DSCR) will provide one or
9more configuration registers often protected by a lock register where one or 9more configuration registers often protected by a lock register where one or
10more key values must be written to a lock register in order to unlock the 10more key values must be written to a lock register in order to unlock the
11configuration register for writes. These configuration register may be used to 11configuration register for writes. These configuration register may be used to
diff --git a/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt b/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt
index a1201802f90d..75e2e1999f87 100644
--- a/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt
+++ b/Documentation/devicetree/bindings/clock/clk-exynos-audss.txt
@@ -2,7 +2,7 @@
2 2
3The Samsung Audio Subsystem clock controller generates and supplies clocks 3The Samsung Audio Subsystem clock controller generates and supplies clocks
4to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock 4to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock
5binding described here is applicable to all SoC's in Exynos family. 5binding described here is applicable to all SoCs in Exynos family.
6 6
7Required Properties: 7Required Properties:
8 8
diff --git a/Documentation/devicetree/bindings/clock/st,nomadik.txt b/Documentation/devicetree/bindings/clock/st,nomadik.txt
index 7fc09773de46..40e0cf1f7b99 100644
--- a/Documentation/devicetree/bindings/clock/st,nomadik.txt
+++ b/Documentation/devicetree/bindings/clock/st,nomadik.txt
@@ -17,7 +17,7 @@ Optional properties for the SRC node:
17- disable-mxtal: if present this will disable the MXTALO, 17- disable-mxtal: if present this will disable the MXTALO,
18 i.e. the driver output for the main (~19.2 MHz) chrystal, 18 i.e. the driver output for the main (~19.2 MHz) chrystal,
19 if the board has its own circuitry for providing this 19 if the board has its own circuitry for providing this
20 osciallator 20 oscillator
21 21
22 22
23PLL nodes: these nodes represent the two PLLs on the system, 23PLL nodes: these nodes represent the two PLLs on the system,
diff --git a/Documentation/devicetree/bindings/dma/atmel-dma.txt b/Documentation/devicetree/bindings/dma/atmel-dma.txt
index c280a0e6f42d..e1f343c7a34b 100644
--- a/Documentation/devicetree/bindings/dma/atmel-dma.txt
+++ b/Documentation/devicetree/bindings/dma/atmel-dma.txt
@@ -18,14 +18,14 @@ dma0: dma@ffffec00 {
18 18
19DMA clients connected to the Atmel DMA controller must use the format 19DMA clients connected to the Atmel DMA controller must use the format
20described in the dma.txt file, using a three-cell specifier for each channel: 20described in the dma.txt file, using a three-cell specifier for each channel:
21a phandle plus two interger cells. 21a phandle plus two integer cells.
22The three cells in order are: 22The three cells in order are:
23 23
241. A phandle pointing to the DMA controller. 241. A phandle pointing to the DMA controller.
252. The memory interface (16 most significant bits), the peripheral interface 252. The memory interface (16 most significant bits), the peripheral interface
26(16 less significant bits). 26(16 less significant bits).
273. Parameters for the at91 DMA configuration register which are device 273. Parameters for the at91 DMA configuration register which are device
28dependant: 28dependent:
29 - bit 7-0: peripheral identifier for the hardware handshaking interface. The 29 - bit 7-0: peripheral identifier for the hardware handshaking interface. The
30 identifier can be different for tx and rx. 30 identifier can be different for tx and rx.
31 - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP. 31 - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP.
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-dma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-dma.txt
index 2717ecb47db9..7bd8847d6394 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-dma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-dma.txt
@@ -34,7 +34,7 @@ Clients have to specify the DMA requests with phandles in a list.
34Required properties: 34Required properties:
35- dmas: List of one or more DMA request specifiers. One DMA request specifier 35- dmas: List of one or more DMA request specifiers. One DMA request specifier
36 consists of a phandle to the DMA controller followed by the integer 36 consists of a phandle to the DMA controller followed by the integer
37 specifiying the request line. 37 specifying the request line.
38- dma-names: List of string identifiers for the DMA requests. For the correct 38- dma-names: List of string identifiers for the DMA requests. For the correct
39 names, have a look at the specific client driver. 39 names, have a look at the specific client driver.
40 40
diff --git a/Documentation/devicetree/bindings/dma/ste-dma40.txt b/Documentation/devicetree/bindings/dma/ste-dma40.txt
index bea5b73a7390..a8c21c256baa 100644
--- a/Documentation/devicetree/bindings/dma/ste-dma40.txt
+++ b/Documentation/devicetree/bindings/dma/ste-dma40.txt
@@ -37,14 +37,14 @@ Each dmas request consists of 4 cells:
37 1. A phandle pointing to the DMA controller 37 1. A phandle pointing to the DMA controller
38 2. Device Type 38 2. Device Type
39 3. The DMA request line number (only when 'use fixed channel' is set) 39 3. The DMA request line number (only when 'use fixed channel' is set)
40 4. A 32bit mask specifying; mode, direction and endianess [NB: This list will grow] 40 4. A 32bit mask specifying; mode, direction and endianness [NB: This list will grow]
41 0x00000001: Mode: 41 0x00000001: Mode:
42 Logical channel when unset 42 Logical channel when unset
43 Physical channel when set 43 Physical channel when set
44 0x00000002: Direction: 44 0x00000002: Direction:
45 Memory to Device when unset 45 Memory to Device when unset
46 Device to Memory when set 46 Device to Memory when set
47 0x00000004: Endianess: 47 0x00000004: Endianness:
48 Little endian when unset 48 Little endian when unset
49 Big endian when set 49 Big endian when set
50 0x00000008: Use fixed channel: 50 0x00000008: Use fixed channel:
diff --git a/Documentation/devicetree/bindings/mfd/cros-ec.txt b/Documentation/devicetree/bindings/mfd/cros-ec.txt
index e0e59c58a1f9..5f229c5f6da9 100644
--- a/Documentation/devicetree/bindings/mfd/cros-ec.txt
+++ b/Documentation/devicetree/bindings/mfd/cros-ec.txt
@@ -4,7 +4,7 @@ Google's ChromeOS EC is a Cortex-M device which talks to the AP and
4implements various function such as keyboard and battery charging. 4implements various function such as keyboard and battery charging.
5 5
6The EC can be connect through various means (I2C, SPI, LPC) and the 6The EC can be connect through various means (I2C, SPI, LPC) and the
7compatible string used depends on the inteface. Each connection method has 7compatible string used depends on the interface. Each connection method has
8its own driver which connects to the top level interface-agnostic EC driver. 8its own driver which connects to the top level interface-agnostic EC driver.
9Other Linux driver (such as cros-ec-keyb for the matrix keyboard) connect to 9Other Linux driver (such as cros-ec-keyb for the matrix keyboard) connect to
10the top-level driver. 10the top-level driver.
diff --git a/Documentation/devicetree/bindings/net/can/atmel-can.txt b/Documentation/devicetree/bindings/net/can/atmel-can.txt
index 72cf0c5daff4..14e52a0d86ec 100644
--- a/Documentation/devicetree/bindings/net/can/atmel-can.txt
+++ b/Documentation/devicetree/bindings/net/can/atmel-can.txt
@@ -8,7 +8,7 @@ Required properties:
8Example: 8Example:
9 9
10 can0: can@f000c000 { 10 can0: can@f000c000 {
11 compatbile = "atmel,at91sam9x5-can"; 11 compatible = "atmel,at91sam9x5-can";
12 reg = <0xf000c000 0x300>; 12 reg = <0xf000c000 0x300>;
13 interrupts = <40 4 5> 13 interrupts = <40 4 5>
14 }; 14 };
diff --git a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
index 648d60eb9fd8..7ccae490ff6d 100644
--- a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
@@ -37,7 +37,7 @@ Bank: 3 (A, B and C)
37 0xffffffff 0x7fff3ccf /* pioB */ 37 0xffffffff 0x7fff3ccf /* pioB */
38 0xffffffff 0x007fffff /* pioC */ 38 0xffffffff 0x007fffff /* pioC */
39 39
40For each peripheral/bank we will descibe in a u32 if a pin can can be 40For each peripheral/bank we will descibe in a u32 if a pin can be
41configured in it by putting 1 to the pin bit (1 << pin) 41configured in it by putting 1 to the pin bit (1 << pin)
42 42
43Let's take the pioA on peripheral B 43Let's take the pioA on peripheral B
diff --git a/Documentation/devicetree/bindings/serial/rs485.txt b/Documentation/devicetree/bindings/serial/rs485.txt
index 1e753c69fc83..32b1fa1f2a5b 100644
--- a/Documentation/devicetree/bindings/serial/rs485.txt
+++ b/Documentation/devicetree/bindings/serial/rs485.txt
@@ -7,7 +7,7 @@ UART node.
7 7
8Required properties: 8Required properties:
9- rs485-rts-delay: prop-encoded-array <a b> where: 9- rs485-rts-delay: prop-encoded-array <a b> where:
10 * a is the delay beteween rts signal and beginning of data sent in milliseconds. 10 * a is the delay between rts signal and beginning of data sent in milliseconds.
11 it corresponds to the delay before sending data. 11 it corresponds to the delay before sending data.
12 * b is the delay between end of data sent and rts signal in milliseconds 12 * b is the delay between end of data sent and rts signal in milliseconds
13 it corresponds to the delay after sending data and actual release of the line. 13 it corresponds to the delay after sending data and actual release of the line.
diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt
index 0b23261561d2..e31a2a9d2b07 100644
--- a/Documentation/dma-buf-sharing.txt
+++ b/Documentation/dma-buf-sharing.txt
@@ -321,7 +321,7 @@ Access to a dma_buf from the kernel context involves three steps:
321 321
322 When the importer is done accessing the range specified in begin_cpu_access, 322 When the importer is done accessing the range specified in begin_cpu_access,
323 it needs to announce this to the exporter (to facilitate cache flushing and 323 it needs to announce this to the exporter (to facilitate cache flushing and
324 unpinning of any pinned resources). The result of of any dma_buf kmap calls 324 unpinning of any pinned resources). The result of any dma_buf kmap calls
325 after end_cpu_access is undefined. 325 after end_cpu_access is undefined.
326 326
327 Interface: 327 Interface:
diff --git a/Documentation/early-userspace/README b/Documentation/early-userspace/README
index 661a73fad399..93e63a9af30b 100644
--- a/Documentation/early-userspace/README
+++ b/Documentation/early-userspace/README
@@ -83,8 +83,7 @@ Where's this all leading?
83 83
84The klibc distribution contains some of the necessary software to make 84The klibc distribution contains some of the necessary software to make
85early userspace useful. The klibc distribution is currently 85early userspace useful. The klibc distribution is currently
86maintained separately from the kernel, but this may change early in 86maintained separately from the kernel.
87the 2.7 era (it missed the boat for 2.5).
88 87
89You can obtain somewhat infrequent snapshots of klibc from 88You can obtain somewhat infrequent snapshots of klibc from
90ftp://ftp.kernel.org/pub/linux/libs/klibc/ 89ftp://ftp.kernel.org/pub/linux/libs/klibc/
diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt
index 99ea58e65eff..4a9739abc860 100644
--- a/Documentation/fb/fbcon.txt
+++ b/Documentation/fb/fbcon.txt
@@ -150,7 +150,7 @@ C. Boot options
150 150
151C. Attaching, Detaching and Unloading 151C. Attaching, Detaching and Unloading
152 152
153Before going on on how to attach, detach and unload the framebuffer console, an 153Before going on how to attach, detach and unload the framebuffer console, an
154illustration of the dependencies may help. 154illustration of the dependencies may help.
155 155
156The console layer, as with most subsystems, needs a driver that interfaces with 156The console layer, as with most subsystems, needs a driver that interfaces with
diff --git a/Documentation/fb/viafb.modes b/Documentation/fb/viafb.modes
index 02e5b487f00e..2a547da2e5cc 100644
--- a/Documentation/fb/viafb.modes
+++ b/Documentation/fb/viafb.modes
@@ -571,7 +571,7 @@ mode "640x480-60"
571# 160 chars 800 lines 571# 160 chars 800 lines
572# Blank Time 4.798 us 0.564 ms 572# Blank Time 4.798 us 0.564 ms
573# 50 chars 28 lines 573# 50 chars 28 lines
574# Polarity negtive positive 574# Polarity negative positive
575# 575#
576 mode "1280x800-60" 576 mode "1280x800-60"
577# D: 83.500 MHz, H: 49.702 kHz, V: 60.00 Hz 577# D: 83.500 MHz, H: 49.702 kHz, V: 60.00 Hz
diff --git a/Documentation/fb/viafb.txt b/Documentation/fb/viafb.txt
index 444e34b52ae1..1cb2462a71ce 100644
--- a/Documentation/fb/viafb.txt
+++ b/Documentation/fb/viafb.txt
@@ -32,7 +32,7 @@
32 Start viafb with default settings: 32 Start viafb with default settings:
33 #modprobe viafb 33 #modprobe viafb
34 34
35 Start viafb with with user options: 35 Start viafb with user options:
36 #modprobe viafb viafb_mode=800x600 viafb_bpp=16 viafb_refresh=60 36 #modprobe viafb viafb_mode=800x600 viafb_bpp=16 viafb_refresh=60
37 viafb_active_dev=CRT+DVI viafb_dvi_port=DVP1 37 viafb_active_dev=CRT+DVI viafb_dvi_port=DVP1
38 viafb_mode1=1024x768 viafb_bpp=16 viafb_refresh1=60 38 viafb_mode1=1024x768 viafb_bpp=16 viafb_refresh1=60
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index b349d57b76ea..9dae59407437 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -87,7 +87,7 @@ Unless otherwise specified, all options default to off.
87 87
88 device=<devicepath> 88 device=<devicepath>
89 Specify a device during mount so that ioctls on the control device 89 Specify a device during mount so that ioctls on the control device
90 can be avoided. Especialy useful when trying to mount a multi-device 90 can be avoided. Especially useful when trying to mount a multi-device
91 setup as root. May be specified multiple times for multiple devices. 91 setup as root. May be specified multiple times for multiple devices.
92 92
93 discard 93 discard
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index b91cfaaf6a0f..919a3293aaa4 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -2,7 +2,7 @@
2Ext4 Filesystem 2Ext4 Filesystem
3=============== 3===============
4 4
5Ext4 is an an advanced level of the ext3 filesystem which incorporates 5Ext4 is an advanced level of the ext3 filesystem which incorporates
6scalability and reliability enhancements for supporting large filesystems 6scalability and reliability enhancements for supporting large filesystems
7(64 bit) in keeping with increasing disk capacities and state-of-the-art 7(64 bit) in keeping with increasing disk capacities and state-of-the-art
8feature requirements. 8feature requirements.
diff --git a/Documentation/filesystems/nfs/Exporting b/Documentation/filesystems/nfs/Exporting
index 09994c247289..e543b1a619cc 100644
--- a/Documentation/filesystems/nfs/Exporting
+++ b/Documentation/filesystems/nfs/Exporting
@@ -93,7 +93,7 @@ For a filesystem to be exportable it must:
93 2/ make sure that d_splice_alias is used rather than d_add 93 2/ make sure that d_splice_alias is used rather than d_add
94 when ->lookup finds an inode for a given parent and name. 94 when ->lookup finds an inode for a given parent and name.
95 95
96 If inode is NULL, d_splice_alias(inode, dentry) is eqivalent to 96 If inode is NULL, d_splice_alias(inode, dentry) is equivalent to
97 97
98 d_add(dentry, inode), NULL 98 d_add(dentry, inode), NULL
99 99
diff --git a/Documentation/filesystems/nfs/pnfs.txt b/Documentation/filesystems/nfs/pnfs.txt
index 52ae07f5f578..adc81a35fe2d 100644
--- a/Documentation/filesystems/nfs/pnfs.txt
+++ b/Documentation/filesystems/nfs/pnfs.txt
@@ -12,7 +12,7 @@ struct pnfs_layout_hdr
12---------------------- 12----------------------
13The on-the-wire command LAYOUTGET corresponds to struct 13The on-the-wire command LAYOUTGET corresponds to struct
14pnfs_layout_segment, usually referred to by the variable name lseg. 14pnfs_layout_segment, usually referred to by the variable name lseg.
15Each nfs_inode may hold a pointer to a cache of of these layout 15Each nfs_inode may hold a pointer to a cache of these layout
16segments in nfsi->layout, of type struct pnfs_layout_hdr. 16segments in nfsi->layout, of type struct pnfs_layout_hdr.
17 17
18We reference the header for the inode pointing to it, across each 18We reference the header for the inode pointing to it, across each
diff --git a/Documentation/filesystems/qnx6.txt b/Documentation/filesystems/qnx6.txt
index 99e90184a72f..408679789136 100644
--- a/Documentation/filesystems/qnx6.txt
+++ b/Documentation/filesystems/qnx6.txt
@@ -149,7 +149,7 @@ Bitmap system area
149------------------ 149------------------
150 150
151The bitmap itself is divided into three parts. 151The bitmap itself is divided into three parts.
152First the system area, that is split into two halfs. 152First the system area, that is split into two halves.
153Then userspace. 153Then userspace.
154 154
155The requirement for a static, fixed preallocated system area comes from how 155The requirement for a static, fixed preallocated system area comes from how
diff --git a/Documentation/filesystems/relay.txt b/Documentation/filesystems/relay.txt
index 510b722667ac..33e2f3694733 100644
--- a/Documentation/filesystems/relay.txt
+++ b/Documentation/filesystems/relay.txt
@@ -31,7 +31,7 @@ Semantics
31 31
32Each relay channel has one buffer per CPU, each buffer has one or more 32Each relay channel has one buffer per CPU, each buffer has one or more
33sub-buffers. Messages are written to the first sub-buffer until it is 33sub-buffers. Messages are written to the first sub-buffer until it is
34too full to contain a new message, in which case it it is written to 34too full to contain a new message, in which case it is written to
35the next (if available). Messages are never split across sub-buffers. 35the next (if available). Messages are never split across sub-buffers.
36At this point, userspace can be notified so it empties the first 36At this point, userspace can be notified so it empties the first
37sub-buffer, while the kernel continues writing to the next. 37sub-buffer, while the kernel continues writing to the next.
diff --git a/Documentation/filesystems/sysfs-tagging.txt b/Documentation/filesystems/sysfs-tagging.txt
index caaaf1266d8f..eb843e49c5a3 100644
--- a/Documentation/filesystems/sysfs-tagging.txt
+++ b/Documentation/filesystems/sysfs-tagging.txt
@@ -24,7 +24,7 @@ flag between KOBJ_NS_TYPE_NONE and KOBJ_NS_TYPES, and s_ns will
24point to the namespace to which it belongs. 24point to the namespace to which it belongs.
25 25
26Each sysfs superblock's sysfs_super_info contains an array void 26Each sysfs superblock's sysfs_super_info contains an array void
27*ns[KOBJ_NS_TYPES]. When a a task in a tagging namespace 27*ns[KOBJ_NS_TYPES]. When a task in a tagging namespace
28kobj_nstype first mounts sysfs, a new superblock is created. It 28kobj_nstype first mounts sysfs, a new superblock is created. It
29will be differentiated from other sysfs mounts by having its 29will be differentiated from other sysfs mounts by having its
30s_fs_info->ns[kobj_nstype] set to the new namespace. Note that 30s_fs_info->ns[kobj_nstype] set to the new namespace. Note that
diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 12525b17d9ed..5be51fd888bd 100644
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -135,7 +135,7 @@ default behaviour.
135 If the memory cost of 8 log buffers is too high on small 135 If the memory cost of 8 log buffers is too high on small
136 systems, then it may be reduced at some cost to performance 136 systems, then it may be reduced at some cost to performance
137 on metadata intensive workloads. The logbsize option below 137 on metadata intensive workloads. The logbsize option below
138 controls the size of each buffer and so is also relevent to 138 controls the size of each buffer and so is also relevant to
139 this case. 139 this case.
140 140
141 logbsize=value 141 logbsize=value
diff --git a/Documentation/fmc/carrier.txt b/Documentation/fmc/carrier.txt
index 173f6d65c88d..5e4f1dd3e98b 100644
--- a/Documentation/fmc/carrier.txt
+++ b/Documentation/fmc/carrier.txt
@@ -213,7 +213,7 @@ The individual methods perform the following tasks:
213 methods: for example the SPEC driver may define that its carrier 213 methods: for example the SPEC driver may define that its carrier
214 I2C memory is seen at offset 1M and the internal SPI flash is seen 214 I2C memory is seen at offset 1M and the internal SPI flash is seen
215 at offset 16M. This multiplexing of several flash memories in the 215 at offset 16M. This multiplexing of several flash memories in the
216 same address space is is carrier-specific and should only be used 216 same address space is carrier-specific and should only be used
217 by a driver that has verified the `carrier_name' field. 217 by a driver that has verified the `carrier_name' field.
218 218
219 219
diff --git a/Documentation/hwmon/abituguru-datasheet b/Documentation/hwmon/abituguru-datasheet
index 8d2be8a0b1e3..86c0b1251c81 100644
--- a/Documentation/hwmon/abituguru-datasheet
+++ b/Documentation/hwmon/abituguru-datasheet
@@ -299,7 +299,7 @@ Byte 1:
299min threshold (scale as bank 0x26) 299min threshold (scale as bank 0x26)
300 300
301 301
302Warning for the adventerous 302Warning for the adventurous
303=========================== 303===========================
304 304
305A word of caution to those who want to experiment and see if they can figure 305A word of caution to those who want to experiment and see if they can figure
diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches
index 46286460462b..3d1bac399a22 100644
--- a/Documentation/hwmon/submitting-patches
+++ b/Documentation/hwmon/submitting-patches
@@ -1,7 +1,7 @@
1 How to Get Your Patch Accepted Into the Hwmon Subsystem 1 How to Get Your Patch Accepted Into the Hwmon Subsystem
2 ------------------------------------------------------- 2 -------------------------------------------------------
3 3
4This text is is a collection of suggestions for people writing patches or 4This text is a collection of suggestions for people writing patches or
5drivers for the hwmon subsystem. Following these suggestions will greatly 5drivers for the hwmon subsystem. Following these suggestions will greatly
6increase the chances of your change being accepted. 6increase the chances of your change being accepted.
7 7
diff --git a/Documentation/hwspinlock.txt b/Documentation/hwspinlock.txt
index a903ee5e9776..62f7d4ea6e26 100644
--- a/Documentation/hwspinlock.txt
+++ b/Documentation/hwspinlock.txt
@@ -241,7 +241,7 @@ int hwspinlock_example2(void)
241 locks). 241 locks).
242 Should be called from a process context (this function might sleep). 242 Should be called from a process context (this function might sleep).
243 Returns the address of hwspinlock on success, or NULL on error (e.g. 243 Returns the address of hwspinlock on success, or NULL on error (e.g.
244 if the hwspinlock is sill in use). 244 if the hwspinlock is still in use).
245 245
2465. Important structs 2465. Important structs
247 247
diff --git a/Documentation/i2c/upgrading-clients b/Documentation/i2c/upgrading-clients
index d6991625c407..8e5fbd88c7d1 100644
--- a/Documentation/i2c/upgrading-clients
+++ b/Documentation/i2c/upgrading-clients
@@ -196,8 +196,8 @@ static int example_probe(struct i2c_client *i2c_client,
196 196
197Update the detach method, by changing the name to _remove and 197Update the detach method, by changing the name to _remove and
198to delete the i2c_detach_client call. It is possible that you 198to delete the i2c_detach_client call. It is possible that you
199can also remove the ret variable as it is not not needed for 199can also remove the ret variable as it is not needed for any
200any of the core functions. 200of the core functions.
201 201
202- static int example_detach(struct i2c_client *client) 202- static int example_detach(struct i2c_client *client)
203+ static int example_remove(struct i2c_client *client) 203+ static int example_remove(struct i2c_client *client)
diff --git a/Documentation/kmemcheck.txt b/Documentation/kmemcheck.txt
index c28f82895d6b..9398a501fdb9 100644
--- a/Documentation/kmemcheck.txt
+++ b/Documentation/kmemcheck.txt
@@ -91,9 +91,9 @@ information from the kmemcheck warnings, which is extremely valuable in
91debugging a problem. This option is not mandatory, however, because it slows 91debugging a problem. This option is not mandatory, however, because it slows
92down the compilation process and produces a much bigger kernel image. 92down the compilation process and produces a much bigger kernel image.
93 93
94Now the kmemcheck menu should be visible (under "Kernel hacking" / "kmemcheck: 94Now the kmemcheck menu should be visible (under "Kernel hacking" / "Memory
95trap use of uninitialized memory"). Here follows a description of the 95Debugging" / "kmemcheck: trap use of uninitialized memory"). Here follows
96kmemcheck configuration variables: 96a description of the kmemcheck configuration variables:
97 97
98 o CONFIG_KMEMCHECK 98 o CONFIG_KMEMCHECK
99 99
diff --git a/Documentation/leds/leds-lm3556.txt b/Documentation/leds/leds-lm3556.txt
index d9eb91b51913..62278e871b50 100644
--- a/Documentation/leds/leds-lm3556.txt
+++ b/Documentation/leds/leds-lm3556.txt
@@ -71,7 +71,7 @@ To register the chip at address 0x63 on specific adapter, set the platform data
71according to include/linux/platform_data/leds-lm3556.h, set the i2c board info 71according to include/linux/platform_data/leds-lm3556.h, set the i2c board info
72 72
73Example: 73Example:
74 static struct i2c_board_info __initdata board_i2c_ch4[] = { 74 static struct i2c_board_info board_i2c_ch4[] __initdata = {
75 { 75 {
76 I2C_BOARD_INFO(LM3556_NAME, 0x63), 76 I2C_BOARD_INFO(LM3556_NAME, 0x63),
77 .platform_data = &lm3556_pdata, 77 .platform_data = &lm3556_pdata,
diff --git a/Documentation/leds/leds-lp3944.txt b/Documentation/leds/leds-lp3944.txt
index c6eda18b15ef..e88ac3b60c08 100644
--- a/Documentation/leds/leds-lp3944.txt
+++ b/Documentation/leds/leds-lp3944.txt
@@ -37,7 +37,7 @@ registered using the i2c_board_info mechanism.
37To register the chip at address 0x60 on adapter 0, set the platform data 37To register the chip at address 0x60 on adapter 0, set the platform data
38according to include/linux/leds-lp3944.h, set the i2c board info: 38according to include/linux/leds-lp3944.h, set the i2c board info:
39 39
40 static struct i2c_board_info __initdata a910_i2c_board_info[] = { 40 static struct i2c_board_info a910_i2c_board_info[] __initdata = {
41 { 41 {
42 I2C_BOARD_INFO("lp3944", 0x60), 42 I2C_BOARD_INFO("lp3944", 0x60),
43 .platform_data = &a910_lp3944_leds, 43 .platform_data = &a910_lp3944_leds,
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt
index 8fd254c73589..58340d50f8a6 100644
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
@@ -163,7 +163,7 @@ a recent addition and not present on older kernels.
163 at read: contains online/offline state of memory. 163 at read: contains online/offline state of memory.
164 at write: user can specify "online_kernel", 164 at write: user can specify "online_kernel",
165 "online_movable", "online", "offline" command 165 "online_movable", "online", "offline" command
166 which will be performed on al sections in the block. 166 which will be performed on all sections in the block.
167'phys_device' : read-only: designed to show the name of physical memory 167'phys_device' : read-only: designed to show the name of physical memory
168 device. This is not well implemented now. 168 device. This is not well implemented now.
169'removable' : read-only: contains an integer value indicating 169'removable' : read-only: contains an integer value indicating
diff --git a/Documentation/mtd/nand_ecc.txt b/Documentation/mtd/nand_ecc.txt
index 990efd7a9818..e129b2479ea8 100644
--- a/Documentation/mtd/nand_ecc.txt
+++ b/Documentation/mtd/nand_ecc.txt
@@ -543,7 +543,7 @@ THe code within the for loop was changed to:
543 } 543 }
544 544
545As you can see tmppar is used to accumulate the parity within a for 545As you can see tmppar is used to accumulate the parity within a for
546iteration. In the last 3 statements is is added to par and, if needed, 546iteration. In the last 3 statements is added to par and, if needed,
547to rp12 and rp14. 547to rp12 and rp14.
548 548
549While making the changes I also found that I could exploit that tmppar 549While making the changes I also found that I could exploit that tmppar
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt
index 262acf56fa79..e9b54de8fdf7 100644
--- a/Documentation/power/basic-pm-debugging.txt
+++ b/Documentation/power/basic-pm-debugging.txt
@@ -179,7 +179,7 @@ use the PM_TRACE mechanism documented in Documentation/power/s2ram.txt .
179 179
180To verify that the STR works, it is generally more convenient to use the s2ram 180To verify that the STR works, it is generally more convenient to use the s2ram
181tool available from http://suspend.sf.net and documented at 181tool available from http://suspend.sf.net and documented at
182http://en.opensuse.org/SDB:Suspend_to_RAM. 182http://en.opensuse.org/SDB:Suspend_to_RAM (S2RAM_LINK).
183 183
184Namely, after writing "freezer", "devices", "platform", "processors", or "core" 184Namely, after writing "freezer", "devices", "platform", "processors", or "core"
185into /sys/power/pm_test (available if the kernel is compiled with 185into /sys/power/pm_test (available if the kernel is compiled with
@@ -194,10 +194,10 @@ Among other things, the testing with the help of /sys/power/pm_test may allow
194you to identify drivers that fail to suspend or resume their devices. They 194you to identify drivers that fail to suspend or resume their devices. They
195should be unloaded every time before an STR transition. 195should be unloaded every time before an STR transition.
196 196
197Next, you can follow the instructions at http://en.opensuse.org/s2ram to test 197Next, you can follow the instructions at S2RAM_LINK to test the system, but if
198the system, but if it does not work "out of the box", you may need to boot it 198it does not work "out of the box", you may need to boot it with
199with "init=/bin/bash" and test s2ram in the minimal configuration. In that 199"init=/bin/bash" and test s2ram in the minimal configuration. In that case,
200case, you may be able to search for failing drivers by following the procedure 200you may be able to search for failing drivers by following the procedure
201analogous to the one described in section 1. If you find some failing drivers, 201analogous to the one described in section 1. If you find some failing drivers,
202you will have to unload them every time before an STR transition (ie. before 202you will have to unload them every time before an STR transition (ie. before
203you run s2ram), and please report the problems with them. 203you run s2ram), and please report the problems with them.
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index 0b4b63e7e9b6..079160e22bcc 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -50,6 +50,19 @@ echo N > /sys/power/image_size
50 50
51before suspend (it is limited to 500 MB by default). 51before suspend (it is limited to 500 MB by default).
52 52
53. The resume process checks for the presence of the resume device,
54if found, it then checks the contents for the hibernation image signature.
55If both are found, it resumes the hibernation image.
56
57. The resume process may be triggered in two ways:
58 1) During lateinit: If resume=/dev/your_swap_partition is specified on
59 the kernel command line, lateinit runs the resume process. If the
60 resume device has not been probed yet, the resume process fails and
61 bootup continues.
62 2) Manually from an initrd or initramfs: May be run from
63 the init script by using the /sys/power/resume file. It is vital
64 that this be done prior to remounting any filesystems (even as
65 read-only) otherwise data may be corrupted.
53 66
54Article about goals and implementation of Software Suspend for Linux 67Article about goals and implementation of Software Suspend for Linux
55~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 68~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -326,7 +339,7 @@ Q: How can distributions ship a swsusp-supporting kernel with modular
326disk drivers (especially SATA)? 339disk drivers (especially SATA)?
327 340
328A: Well, it can be done, load the drivers, then do echo into 341A: Well, it can be done, load the drivers, then do echo into
329/sys/power/disk/resume file from initrd. Be sure not to mount 342/sys/power/resume file from initrd. Be sure not to mount
330anything, not even read-only mount, or you are going to lose your 343anything, not even read-only mount, or you are going to lose your
331data. 344data.
332 345
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 9552a3299ec9..445ad743ec81 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -97,7 +97,7 @@ IPv4 addresses:
97 97
98 %pI4 1.2.3.4 98 %pI4 1.2.3.4
99 %pi4 001.002.003.004 99 %pi4 001.002.003.004
100 %p[Ii][hnbl] 100 %p[Ii]4[hnbl]
101 101
102 For printing IPv4 dot-separated decimal addresses. The 'I4' and 'i4' 102 For printing IPv4 dot-separated decimal addresses. The 'I4' and 'i4'
103 specifiers result in a printed address with ('i4') or without ('I4') 103 specifiers result in a printed address with ('i4') or without ('I4')
@@ -194,11 +194,11 @@ struct va_format:
194 194
195u64 SHOULD be printed with %llu/%llx, (unsigned long long): 195u64 SHOULD be printed with %llu/%llx, (unsigned long long):
196 196
197 printk("%llu", (unsigned long long)u64_var); 197 printk("%llu", u64_var);
198 198
199s64 SHOULD be printed with %lld/%llx, (long long): 199s64 SHOULD be printed with %lld/%llx, (long long):
200 200
201 printk("%lld", (long long)s64_var); 201 printk("%lld", s64_var);
202 202
203If <type> is dependent on a config option for its size (e.g., sector_t, 203If <type> is dependent on a config option for its size (e.g., sector_t,
204blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a 204blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a
diff --git a/Documentation/rapidio/rapidio.txt b/Documentation/rapidio/rapidio.txt
index 717f5aa388b1..28fbd877f85a 100644
--- a/Documentation/rapidio/rapidio.txt
+++ b/Documentation/rapidio/rapidio.txt
@@ -300,7 +300,7 @@ initialization.
300------------------------------------------- 300-------------------------------------------
301 301
302RapidIO subsystem code organization allows addition of new enumeration/discovery 302RapidIO subsystem code organization allows addition of new enumeration/discovery
303methods as new configuration options without significant impact to to the core 303methods as new configuration options without significant impact to the core
304RapidIO code. 304RapidIO code.
305 305
306A new enumeration/discovery method has to be attached to one or more mport 306A new enumeration/discovery method has to be attached to one or more mport
diff --git a/Documentation/scsi/hptiop.txt b/Documentation/scsi/hptiop.txt
index 4a4f47e759cd..12ecfd308e55 100644
--- a/Documentation/scsi/hptiop.txt
+++ b/Documentation/scsi/hptiop.txt
@@ -151,7 +151,7 @@ To send a request to the controller:
151 generated. 151 generated.
152 152
153 - The host read the outbound list copy pointer shadow register and compare 153 - The host read the outbound list copy pointer shadow register and compare
154 with previous saved read ponter N. If they are different, the host will 154 with previous saved read pointer N. If they are different, the host will
155 read the (N+1)th outbound list unit. 155 read the (N+1)th outbound list unit.
156 156
157 The host get the index of the request from the (N+1)th outbound list 157 The host get the index of the request from the (N+1)th outbound list
diff --git a/Documentation/sound/alsa/README.maya44 b/Documentation/sound/alsa/README.maya44
index 0e41576fa13e..67b2ea1cc31d 100644
--- a/Documentation/sound/alsa/README.maya44
+++ b/Documentation/sound/alsa/README.maya44
@@ -120,7 +120,7 @@ Mic Phantom+48V: switch for +48V phantom power for electrostatic microphones on
120 Make sure this is not turned on while any other source is connected to input 1/2. 120 Make sure this is not turned on while any other source is connected to input 1/2.
121 It might damage the source and/or the maya44 card. 121 It might damage the source and/or the maya44 card.
122 122
123Mic/Line input: if switch is is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo). 123Mic/Line input: if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo).
124 124
125Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver. 125Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver.
126Bypass 1: same for channel 3+4. 126Bypass 1: same for channel 3+4.
diff --git a/Documentation/sound/alsa/compress_offload.txt b/Documentation/sound/alsa/compress_offload.txt
index 0bcc55155911..fd74ff26376e 100644
--- a/Documentation/sound/alsa/compress_offload.txt
+++ b/Documentation/sound/alsa/compress_offload.txt
@@ -73,7 +73,7 @@ The main requirements are:
73 73
74Design 74Design
75 75
76The new API shares a number of concepts with with the PCM API for flow 76The new API shares a number of concepts with the PCM API for flow
77control. Start, pause, resume, drain and stop commands have the same 77control. Start, pause, resume, drain and stop commands have the same
78semantics no matter what the content is. 78semantics no matter what the content is.
79 79
@@ -130,7 +130,7 @@ the settings should remain the exception.
130The timestamp becomes a multiple field structure. It lists the number 130The timestamp becomes a multiple field structure. It lists the number
131of bytes transferred, the number of samples processed and the number 131of bytes transferred, the number of samples processed and the number
132of samples rendered/grabbed. All these values can be used to determine 132of samples rendered/grabbed. All these values can be used to determine
133the avarage bitrate, figure out if the ring buffer needs to be 133the average bitrate, figure out if the ring buffer needs to be
134refilled or the delay due to decoding/encoding/io on the DSP. 134refilled or the delay due to decoding/encoding/io on the DSP.
135 135
136Note that the list of codecs/profiles/modes was derived from the 136Note that the list of codecs/profiles/modes was derived from the
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index c1a1fd636bf9..a5f985ee1822 100644
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
@@ -47,7 +47,7 @@ versions of the sysfs interface.
47 at device creation and removal 47 at device creation and removal
48 - the unique key to the device at that point in time 48 - the unique key to the device at that point in time
49 - the kernel's path to the device directory without the leading 49 - the kernel's path to the device directory without the leading
50 /sys, and always starting with with a slash 50 /sys, and always starting with a slash
51 - all elements of a devpath must be real directories. Symlinks 51 - all elements of a devpath must be real directories. Symlinks
52 pointing to /sys/devices must always be resolved to their real 52 pointing to /sys/devices must always be resolved to their real
53 target and the target path must be used to access the device. 53 target and the target path must be used to access the device.
diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index 3fe0d812dcec..54d29c1320ed 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -300,7 +300,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
300 buf += " int ret;\n\n" 300 buf += " int ret;\n\n"
301 buf += " if (strstr(name, \"tpgt_\") != name)\n" 301 buf += " if (strstr(name, \"tpgt_\") != name)\n"
302 buf += " return ERR_PTR(-EINVAL);\n" 302 buf += " return ERR_PTR(-EINVAL);\n"
303 buf += " if (strict_strtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n" 303 buf += " if (kstrtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n"
304 buf += " return ERR_PTR(-EINVAL);\n\n" 304 buf += " return ERR_PTR(-EINVAL);\n\n"
305 buf += " tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n" 305 buf += " tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n"
306 buf += " if (!tpg) {\n" 306 buf += " if (!tpg) {\n"
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt
index b937c6e2163c..ea2d35d64d26 100644
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
@@ -735,7 +735,7 @@ Here are the available options:
735 function as well as the function being traced. 735 function as well as the function being traced.
736 736
737 print-parent: 737 print-parent:
738 bash-4000 [01] 1477.606694: simple_strtoul <-strict_strtoul 738 bash-4000 [01] 1477.606694: simple_strtoul <-kstrtoul
739 739
740 noprint-parent: 740 noprint-parent:
741 bash-4000 [01] 1477.606694: simple_strtoul 741 bash-4000 [01] 1477.606694: simple_strtoul
@@ -759,7 +759,7 @@ Here are the available options:
759 latency-format option is enabled. 759 latency-format option is enabled.
760 760
761 bash 4000 1 0 00000000 00010a95 [58127d26] 1720.415ms \ 761 bash 4000 1 0 00000000 00010a95 [58127d26] 1720.415ms \
762 (+0.000ms): simple_strtoul (strict_strtoul) 762 (+0.000ms): simple_strtoul (kstrtoul)
763 763
764 raw - This will display raw numbers. This option is best for 764 raw - This will display raw numbers. This option is best for
765 use with user applications that can translate the raw 765 use with user applications that can translate the raw
diff --git a/Documentation/trace/tracepoints.txt b/Documentation/trace/tracepoints.txt
index da49437d5aeb..ac4170dd0f24 100644
--- a/Documentation/trace/tracepoints.txt
+++ b/Documentation/trace/tracepoints.txt
@@ -40,7 +40,13 @@ Two elements are required for tracepoints :
40 40
41In order to use tracepoints, you should include linux/tracepoint.h. 41In order to use tracepoints, you should include linux/tracepoint.h.
42 42
43In include/trace/subsys.h : 43In include/trace/events/subsys.h :
44
45#undef TRACE_SYSTEM
46#define TRACE_SYSTEM subsys
47
48#if !defined(_TRACE_SUBSYS_H) || defined(TRACE_HEADER_MULTI_READ)
49#define _TRACE_SUBSYS_H
44 50
45#include <linux/tracepoint.h> 51#include <linux/tracepoint.h>
46 52
@@ -48,10 +54,16 @@ DECLARE_TRACE(subsys_eventname,
48 TP_PROTO(int firstarg, struct task_struct *p), 54 TP_PROTO(int firstarg, struct task_struct *p),
49 TP_ARGS(firstarg, p)); 55 TP_ARGS(firstarg, p));
50 56
57#endif /* _TRACE_SUBSYS_H */
58
59/* This part must be outside protection */
60#include <trace/define_trace.h>
61
51In subsys/file.c (where the tracing statement must be added) : 62In subsys/file.c (where the tracing statement must be added) :
52 63
53#include <trace/subsys.h> 64#include <trace/events/subsys.h>
54 65
66#define CREATE_TRACE_POINTS
55DEFINE_TRACE(subsys_eventname); 67DEFINE_TRACE(subsys_eventname);
56 68
57void somefct(void) 69void somefct(void)
@@ -72,6 +84,9 @@ Where :
72- TP_ARGS(firstarg, p) are the parameters names, same as found in the 84- TP_ARGS(firstarg, p) are the parameters names, same as found in the
73 prototype. 85 prototype.
74 86
87- if you use the header in multiple source files, #define CREATE_TRACE_POINTS
88 should appear only in one source file.
89
75Connecting a function (probe) to a tracepoint is done by providing a 90Connecting a function (probe) to a tracepoint is done by providing a
76probe (function to call) for the specific tracepoint through 91probe (function to call) for the specific tracepoint through
77register_trace_subsys_eventname(). Removing a probe is done through 92register_trace_subsys_eventname(). Removing a probe is done through
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index ef925eaa1460..858aecf21db2 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -53,7 +53,7 @@ incompatible change are allowed. However, there is an extension
53facility that allows backward-compatible extensions to the API to be 53facility that allows backward-compatible extensions to the API to be
54queried and used. 54queried and used.
55 55
56The extension mechanism is not based on on the Linux version number. 56The extension mechanism is not based on the Linux version number.
57Instead, kvm defines extension identifiers and a facility to query 57Instead, kvm defines extension identifiers and a facility to query
58whether a particular extension identifier is available. If it is, a 58whether a particular extension identifier is available. If it is, a
59set of ioctls is available for application use. 59set of ioctls is available for application use.
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index fc66d42422ee..f4f268c2b826 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -58,7 +58,7 @@ Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover
58 protocol entry point. 58 protocol entry point.
59 59
60Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields 60Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields
61 to struct boot_params for for loading bzImage and ramdisk 61 to struct boot_params for loading bzImage and ramdisk
62 above 4G in 64bit. 62 above 4G in 64bit.
63 63
64**** MEMORY LAYOUT 64**** MEMORY LAYOUT
diff --git a/Documentation/zh_CN/SubmittingPatches b/Documentation/zh_CN/SubmittingPatches
index 0f4385a62a49..be0bd4725062 100644
--- a/Documentation/zh_CN/SubmittingPatches
+++ b/Documentation/zh_CN/SubmittingPatches
@@ -146,7 +146,7 @@ Majordomo lists of VGER.KERNEL.ORG at:
146 <http://vger.kernel.org/vger-lists.html> 146 <http://vger.kernel.org/vger-lists.html>
147 147
148如果改动影响了用户空间和内核之间的接口,请给 MAN-PAGES 的维护者(列在 148如果改动影响了用户空间和内核之间的接口,请给 MAN-PAGES 的维护者(列在
149MAITAINERS 文件里的)发送一个手册页(man-pages)补丁,或者至少通知一下改 149MAINTAINERS 文件里的)发送一个手册页(man-pages)补丁,或者至少通知一下改
150变,让一些信息有途径进入手册页。 150变,让一些信息有途径进入手册页。
151 151
152即使在第四步的时候,维护者没有作出回应,也要确认在修改他们的代码的时候 152即使在第四步的时候,维护者没有作出回应,也要确认在修改他们的代码的时候
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 07349b002687..1cba8f29bb49 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -78,7 +78,7 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs)
78 err |= __copy_from_user(regs->iaoq, sc->sc_iaoq, sizeof(regs->iaoq)); 78 err |= __copy_from_user(regs->iaoq, sc->sc_iaoq, sizeof(regs->iaoq));
79 err |= __copy_from_user(regs->iasq, sc->sc_iasq, sizeof(regs->iasq)); 79 err |= __copy_from_user(regs->iasq, sc->sc_iasq, sizeof(regs->iasq));
80 err |= __get_user(regs->sar, &sc->sc_sar); 80 err |= __get_user(regs->sar, &sc->sc_sar);
81 DBG(2,"restore_sigcontext: iaoq is 0x%#lx / 0x%#lx\n", 81 DBG(2,"restore_sigcontext: iaoq is %#lx / %#lx\n",
82 regs->iaoq[0],regs->iaoq[1]); 82 regs->iaoq[0],regs->iaoq[1]);
83 DBG(2,"restore_sigcontext: r28 is %ld\n", regs->gr[28]); 83 DBG(2,"restore_sigcontext: r28 is %ld\n", regs->gr[28]);
84 return err; 84 return err;
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 01e2db97a210..d47d3dab4870 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -52,7 +52,7 @@
52#if defined(CONFIG_KERNEL_START_BOOL) || defined(CONFIG_LOWMEM_SIZE_BOOL) 52#if defined(CONFIG_KERNEL_START_BOOL) || defined(CONFIG_LOWMEM_SIZE_BOOL)
53/* The amount of lowmem must be within 0xF0000000 - KERNELBASE. */ 53/* The amount of lowmem must be within 0xF0000000 - KERNELBASE. */
54#if (CONFIG_LOWMEM_SIZE > (0xF0000000 - PAGE_OFFSET)) 54#if (CONFIG_LOWMEM_SIZE > (0xF0000000 - PAGE_OFFSET))
55#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_START_KERNEL" 55#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_KERNEL_START"
56#endif 56#endif
57#endif 57#endif
58#define MAX_LOW_MEM CONFIG_LOWMEM_SIZE 58#define MAX_LOW_MEM CONFIG_LOWMEM_SIZE
diff --git a/crypto/api.c b/crypto/api.c
index 3b6180336d3d..320ea4d8a0f5 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -391,7 +391,7 @@ EXPORT_SYMBOL_GPL(__crypto_alloc_tfm);
391 * @mask: Mask for type comparison 391 * @mask: Mask for type comparison
392 * 392 *
393 * This function should not be used by new algorithm types. 393 * This function should not be used by new algorithm types.
394 * Plesae use crypto_alloc_tfm instead. 394 * Please use crypto_alloc_tfm instead.
395 * 395 *
396 * crypto_alloc_base() will first attempt to locate an already loaded 396 * crypto_alloc_base() will first attempt to locate an already loaded
397 * algorithm. If that fails and the kernel supports dynamically loadable 397 * algorithm. If that fails and the kernel supports dynamically loadable
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 64fbb8385cdc..b12c11ec4bd2 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -393,7 +393,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
393 * we must not block on IO to ourselves. 393 * we must not block on IO to ourselves.
394 * Context is receiver thread or dmsetup. */ 394 * Context is receiver thread or dmsetup. */
395 bytes = sizeof(struct page *)*want; 395 bytes = sizeof(struct page *)*want;
396 new_pages = kzalloc(bytes, GFP_NOIO); 396 new_pages = kzalloc(bytes, GFP_NOIO | __GFP_NOWARN);
397 if (!new_pages) { 397 if (!new_pages) {
398 new_pages = __vmalloc(bytes, 398 new_pages = __vmalloc(bytes,
399 GFP_NOIO | __GFP_HIGHMEM | __GFP_ZERO, 399 GFP_NOIO | __GFP_HIGHMEM | __GFP_ZERO,
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 6efe4d1ab3aa..6eab88985670 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -200,14 +200,14 @@ static int __init init_acpi_pm_clocksource(void)
200 if ((value2 < value1) && ((value2) < 0xFFF)) 200 if ((value2 < value1) && ((value2) < 0xFFF))
201 break; 201 break;
202 printk(KERN_INFO "PM-Timer had inconsistent results:" 202 printk(KERN_INFO "PM-Timer had inconsistent results:"
203 " 0x%#llx, 0x%#llx - aborting.\n", 203 " %#llx, %#llx - aborting.\n",
204 value1, value2); 204 value1, value2);
205 pmtmr_ioport = 0; 205 pmtmr_ioport = 0;
206 return -EINVAL; 206 return -EINVAL;
207 } 207 }
208 if (i == ACPI_PM_READ_CHECKS) { 208 if (i == ACPI_PM_READ_CHECKS) {
209 printk(KERN_INFO "PM-Timer failed consistency check " 209 printk(KERN_INFO "PM-Timer failed consistency check "
210 " (0x%#llx) - aborting.\n", value1); 210 " (%#llx) - aborting.\n", value1);
211 pmtmr_ioport = 0; 211 pmtmr_ioport = 0;
212 return -ENODEV; 212 return -ENODEV;
213 } 213 }
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 496ae6aae316..33693d966b6a 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -282,7 +282,7 @@ static int get_empty_message_digest(
282 } 282 }
283 } else { 283 } else {
284 dev_dbg(device_data->dev, "[%s] Continue hash " 284 dev_dbg(device_data->dev, "[%s] Continue hash "
285 "calculation, since hmac key avalable", 285 "calculation, since hmac key available",
286 __func__); 286 __func__);
287 } 287 }
288 } 288 }
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index b9b776f1e582..d8dd269b9159 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1541,7 +1541,7 @@ int r300_init(struct radeon_device *rdev)
1541 rdev->accel_working = true; 1541 rdev->accel_working = true;
1542 r = r300_startup(rdev); 1542 r = r300_startup(rdev);
1543 if (r) { 1543 if (r) {
1544 /* Somethings want wront with the accel init stop accel */ 1544 /* Something went wrong with the accel init, so stop accel */
1545 dev_err(rdev->dev, "Disabling GPU acceleration\n"); 1545 dev_err(rdev->dev, "Disabling GPU acceleration\n");
1546 r100_cp_fini(rdev); 1546 r100_cp_fini(rdev);
1547 radeon_wb_fini(rdev); 1547 radeon_wb_fini(rdev);
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index 62c71fadb4d9..8d594517cd29 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -222,7 +222,8 @@ int ipz_queue_ctor(struct ehca_pd *pd, struct ipz_queue *queue,
222 queue->small_page = NULL; 222 queue->small_page = NULL;
223 223
224 /* allocate queue page pointers */ 224 /* allocate queue page pointers */
225 queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *), GFP_KERNEL); 225 queue->queue_pages = kzalloc(nr_of_pages * sizeof(void *),
226 GFP_KERNEL | __GFP_NOWARN);
226 if (!queue->queue_pages) { 227 if (!queue->queue_pages) {
227 queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *)); 228 queue->queue_pages = vzalloc(nr_of_pages * sizeof(void *));
228 if (!queue->queue_pages) { 229 if (!queue->queue_pages) {
diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c
index d6890bc37198..a2275cfe0b81 100644
--- a/drivers/media/usb/gspca/vicam.c
+++ b/drivers/media/usb/gspca/vicam.c
@@ -6,7 +6,7 @@
6 * Based on the usbvideo vicam driver, which is: 6 * Based on the usbvideo vicam driver, which is:
7 * 7 *
8 * Copyright (c) 2002 Joe Burks (jburks@wavicle.org), 8 * Copyright (c) 2002 Joe Burks (jburks@wavicle.org),
9 * Christopher L Cheney (ccheney@cheney.cx), 9 * Chris Cheney (chris.cheney@gmail.com),
10 * Pavel Machek (pavel@ucw.cz), 10 * Pavel Machek (pavel@ucw.cz),
11 * John Tyner (jtyner@cs.ucr.edu), 11 * John Tyner (jtyner@cs.ucr.edu),
12 * Monroe Williams (monroe@pobox.com) 12 * Monroe Williams (monroe@pobox.com)
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 4058b856eb71..76ae09999b5b 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -1157,7 +1157,7 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new,
1157 */ 1157 */
1158void *cxgb_alloc_mem(unsigned long size) 1158void *cxgb_alloc_mem(unsigned long size)
1159{ 1159{
1160 void *p = kzalloc(size, GFP_KERNEL); 1160 void *p = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
1161 1161
1162 if (!p) 1162 if (!p)
1163 p = vzalloc(size); 1163 p = vzalloc(size);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 79ac77cf62d9..0d0665ca6f19 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1142,7 +1142,7 @@ out: release_firmware(fw);
1142 */ 1142 */
1143void *t4_alloc_mem(size_t size) 1143void *t4_alloc_mem(size_t size)
1144{ 1144{
1145 void *p = kzalloc(size, GFP_KERNEL); 1145 void *p = kzalloc(size, GFP_KERNEL | __GFP_NOWARN);
1146 1146
1147 if (!p) 1147 if (!p)
1148 p = vzalloc(size); 1148 p = vzalloc(size);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index a1818dae47b6..3ca00e05f23d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -3148,7 +3148,7 @@ int qlcnic_83xx_set_settings(struct qlcnic_adapter *adapter,
3148 status = qlcnic_83xx_set_port_config(adapter); 3148 status = qlcnic_83xx_set_port_config(adapter);
3149 if (status) { 3149 if (status) {
3150 dev_info(&adapter->pdev->dev, 3150 dev_info(&adapter->pdev->dev,
3151 "Faild to Set Link Speed and autoneg.\n"); 3151 "Failed to Set Link Speed and autoneg.\n");
3152 adapter->ahw->port_config = config; 3152 adapter->ahw->port_config = config;
3153 } 3153 }
3154 return status; 3154 return status;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index b7b245b43b87..11b4bb83b930 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -1781,7 +1781,7 @@ static int qlcnic_83xx_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring,
1781 break; 1781 break;
1782 default: 1782 default:
1783 dev_info(&adapter->pdev->dev, 1783 dev_info(&adapter->pdev->dev,
1784 "Unkonwn opcode: 0x%x\n", opcode); 1784 "Unknown opcode: 0x%x\n", opcode);
1785 goto skip; 1785 goto skip;
1786 } 1786 }
1787 1787
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index b7a39305472b..975dc2d8e548 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1709,7 +1709,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)
1709 1709
1710 if(netif_msg_intr(sis_priv)) 1710 if(netif_msg_intr(sis_priv))
1711 printk(KERN_DEBUG "%s: exiting interrupt, " 1711 printk(KERN_DEBUG "%s: exiting interrupt, "
1712 "interrupt status = 0x%#8.8x.\n", 1712 "interrupt status = %#8.8x\n",
1713 net_dev->name, sr32(isr)); 1713 net_dev->name, sr32(isr));
1714 1714
1715 spin_unlock (&sis_priv->lock); 1715 spin_unlock (&sis_priv->lock);
diff --git a/drivers/net/wireless/cw1200/wsm.c b/drivers/net/wireless/cw1200/wsm.c
index cbb74d7a9be5..9e0ca3048657 100644
--- a/drivers/net/wireless/cw1200/wsm.c
+++ b/drivers/net/wireless/cw1200/wsm.c
@@ -1199,7 +1199,7 @@ bool wsm_flush_tx(struct cw1200_common *priv)
1199 1199
1200 if (priv->bh_error) { 1200 if (priv->bh_error) {
1201 /* In case of failure do not wait for magic. */ 1201 /* In case of failure do not wait for magic. */
1202 pr_err("[WSM] Fatal error occured, will not flush TX.\n"); 1202 pr_err("[WSM] Fatal error occurred, will not flush TX.\n");
1203 return false; 1203 return false;
1204 } else { 1204 } else {
1205 /* Get a timestamp of "oldest" frame */ 1205 /* Get a timestamp of "oldest" frame */
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index c17b74c31398..76a3c177e100 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -199,7 +199,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
199 * and know the dtim period. 199 * and know the dtim period.
200 */ 200 */
201 iwl_mvm_te_check_disconnect(mvm, te_data->vif, 201 iwl_mvm_te_check_disconnect(mvm, te_data->vif,
202 "No assocation and the time event is over already..."); 202 "No association and the time event is over already...");
203 iwl_mvm_te_clear_data(mvm, te_data); 203 iwl_mvm_te_clear_data(mvm, te_data);
204 } else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) { 204 } else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) {
205 te_data->running = true; 205 te_data->running = true;
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
index 57e4cc5833a9..557bc5b8327e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/fw.c
@@ -341,7 +341,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
341 wait_h2c_limit--; 341 wait_h2c_limit--;
342 if (wait_h2c_limit == 0) { 342 if (wait_h2c_limit == 0) {
343 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, 343 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
344 "Wating too long for FW read " 344 "Waiting too long for FW read "
345 "clear HMEBox(%d)!\n", boxnum); 345 "clear HMEBox(%d)!\n", boxnum);
346 break; 346 break;
347 } 347 }
@@ -351,7 +351,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw,
351 isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum); 351 isfw_read = _rtl88e_check_fw_read_last_h2c(hw, boxnum);
352 u1b_tmp = rtl_read_byte(rtlpriv, 0x130); 352 u1b_tmp = rtl_read_byte(rtlpriv, 0x130);
353 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, 353 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
354 "Wating for FW read clear HMEBox(%d)!!! " 354 "Waiting for FW read clear HMEBox(%d)!!! "
355 "0x130 = %2x\n", boxnum, u1b_tmp); 355 "0x130 = %2x\n", boxnum, u1b_tmp);
356 } 356 }
357 357
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 47875ba09ff8..f700f7a614b2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -416,7 +416,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
416 416
417 /* because we will send data pkt when scanning 417 /* because we will send data pkt when scanning
418 * this will cause some ap like gear-3700 wep TP 418 * this will cause some ap like gear-3700 wep TP
419 * lower if we retrun here, this is the diff of 419 * lower if we return here, this is the diff of
420 * mac80211 driver vs ieee80211 driver */ 420 * mac80211 driver vs ieee80211 driver */
421 /* if (rtlpriv->mac80211.act_scanning) 421 /* if (rtlpriv->mac80211.act_scanning)
422 * return; */ 422 * return; */
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
index dedfa1ed3e02..ba1502b172a6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/fw.c
@@ -330,7 +330,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
330 wait_h2c_limmit--; 330 wait_h2c_limmit--;
331 if (wait_h2c_limmit == 0) { 331 if (wait_h2c_limmit == 0) {
332 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, 332 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
333 "Wating too long for FW read clear HMEBox(%d)!\n", 333 "Waiting too long for FW read clear HMEBox(%d)!\n",
334 boxnum); 334 boxnum);
335 break; 335 break;
336 } 336 }
@@ -340,7 +340,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw,
340 isfw_rd = rtl8723ae_check_fw_read_last_h2c(hw, boxnum); 340 isfw_rd = rtl8723ae_check_fw_read_last_h2c(hw, boxnum);
341 u1tmp = rtl_read_byte(rtlpriv, 0x1BF); 341 u1tmp = rtl_read_byte(rtlpriv, 0x1BF);
342 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, 342 RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD,
343 "Wating for FW read clear HMEBox(%d)!!! " 343 "Waiting for FW read clear HMEBox(%d)!!! "
344 "0x1BF = %2x\n", boxnum, u1tmp); 344 "0x1BF = %2x\n", boxnum, u1tmp);
345 } 345 }
346 346
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c
index ffff66b1c1aa..de029bbc1cc1 100644
--- a/drivers/power/88pm860x_charger.c
+++ b/drivers/power/88pm860x_charger.c
@@ -554,7 +554,7 @@ static irqreturn_t pm860x_vchg_handler(int irq, void *data)
554 OVTEMP_AUTORECOVER, 554 OVTEMP_AUTORECOVER,
555 OVTEMP_AUTORECOVER); 555 OVTEMP_AUTORECOVER);
556 dev_dbg(info->dev, 556 dev_dbg(info->dev,
557 "%s, pm8606 over-temp occure\n", __func__); 557 "%s, pm8606 over-temp occurred\n", __func__);
558 } 558 }
559 } 559 }
560 560
@@ -562,7 +562,7 @@ static irqreturn_t pm860x_vchg_handler(int irq, void *data)
562 set_vchg_threshold(info, VCHG_OVP_LOW, 0); 562 set_vchg_threshold(info, VCHG_OVP_LOW, 0);
563 info->allowed = 0; 563 info->allowed = 0;
564 dev_dbg(info->dev, 564 dev_dbg(info->dev,
565 "%s,pm8607 over-vchg occure,vchg = %dmv\n", 565 "%s,pm8607 over-vchg occurred,vchg = %dmv\n",
566 __func__, vchg); 566 __func__, vchg);
567 } else if (vchg < VCHG_OVP_LOW) { 567 } else if (vchg < VCHG_OVP_LOW) {
568 set_vchg_threshold(info, VCHG_NORMAL_LOW, 568 set_vchg_threshold(info, VCHG_NORMAL_LOW,
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index 1c0bfcbae062..ffa10ed83eb1 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -386,7 +386,7 @@ static int pm2_int_reg2(void *pm2_data, int val)
386 if (val & (PM2XXX_INT3_ITCHPRECHARGEWD | 386 if (val & (PM2XXX_INT3_ITCHPRECHARGEWD |
387 PM2XXX_INT3_ITCHCCWD | PM2XXX_INT3_ITCHCVWD)) { 387 PM2XXX_INT3_ITCHCCWD | PM2XXX_INT3_ITCHCVWD)) {
388 dev_dbg(pm2->dev, 388 dev_dbg(pm2->dev,
389 "Watchdog occured for precharge, CC and CV charge\n"); 389 "Watchdog occurred for precharge, CC and CV charge\n");
390 } 390 }
391 391
392 return ret; 392 return ret;
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 9796284512a9..9967f9c14851 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -206,7 +206,7 @@ bfad_im_abort_handler(struct scsi_cmnd *cmnd)
206 spin_lock_irqsave(&bfad->bfad_lock, flags); 206 spin_lock_irqsave(&bfad->bfad_lock, flags);
207 hal_io = (struct bfa_ioim_s *) cmnd->host_scribble; 207 hal_io = (struct bfa_ioim_s *) cmnd->host_scribble;
208 if (!hal_io) { 208 if (!hal_io) {
209 /* IO has been completed, retrun success */ 209 /* IO has been completed, return success */
210 rc = SUCCESS; 210 rc = SUCCESS;
211 goto out; 211 goto out;
212 } 212 }
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 80fa99b3d384..8135f04671af 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -658,11 +658,11 @@ static inline u32 cxgbi_tag_nonrsvd_bits(struct cxgbi_tag_format *tformat,
658static inline void *cxgbi_alloc_big_mem(unsigned int size, 658static inline void *cxgbi_alloc_big_mem(unsigned int size,
659 gfp_t gfp) 659 gfp_t gfp)
660{ 660{
661 void *p = kmalloc(size, gfp); 661 void *p = kzalloc(size, gfp | __GFP_NOWARN);
662
662 if (!p) 663 if (!p)
663 p = vmalloc(size); 664 p = vzalloc(size);
664 if (p) 665
665 memset(p, 0, size);
666 return p; 666 return p;
667} 667}
668 668
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index b766f5aea584..fac8cf5832dd 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1054,7 +1054,7 @@ free_and_out:
1054} 1054}
1055 1055
1056/* 1056/*
1057 * Lookup bus/target/lun and retrun corresponding struct hpsa_scsi_dev_t * 1057 * Lookup bus/target/lun and return corresponding struct hpsa_scsi_dev_t *
1058 * Assume's h->devlock is held. 1058 * Assume's h->devlock is held.
1059 */ 1059 */
1060static struct hpsa_scsi_dev_t *lookup_hpsa_scsi_dev(struct ctlr_info *h, 1060static struct hpsa_scsi_dev_t *lookup_hpsa_scsi_dev(struct ctlr_info *h,
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 22f42f866f75..16498e030c70 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -816,7 +816,7 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr,
816 * the readyness after performing a firmware reset. 816 * the readyness after performing a firmware reset.
817 * 817 *
818 * Returns: 818 * Returns:
819 * zero for success, -EPERM when port does not have privilage to perform the 819 * zero for success, -EPERM when port does not have privilege to perform the
820 * reset, -EIO when port timeout from recovering from the reset. 820 * reset, -EIO when port timeout from recovering from the reset.
821 * 821 *
822 * Note: 822 * Note:
@@ -833,7 +833,7 @@ lpfc_sli4_pdev_status_reg_wait(struct lpfc_hba *phba)
833 lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr, 833 lpfc_readl(phba->sli4_hba.u.if_type2.STATUSregaddr,
834 &portstat_reg.word0); 834 &portstat_reg.word0);
835 835
836 /* verify if privilaged for the request operation */ 836 /* verify if privileged for the request operation */
837 if (!bf_get(lpfc_sliport_status_rn, &portstat_reg) && 837 if (!bf_get(lpfc_sliport_status_rn, &portstat_reg) &&
838 !bf_get(lpfc_sliport_status_err, &portstat_reg)) 838 !bf_get(lpfc_sliport_status_err, &portstat_reg))
839 return -EPERM; 839 return -EPERM;
@@ -925,9 +925,9 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)
925 rc = lpfc_sli4_pdev_status_reg_wait(phba); 925 rc = lpfc_sli4_pdev_status_reg_wait(phba);
926 926
927 if (rc == -EPERM) { 927 if (rc == -EPERM) {
928 /* no privilage for reset */ 928 /* no privilege for reset */
929 lpfc_printf_log(phba, KERN_ERR, LOG_SLI, 929 lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
930 "3150 No privilage to perform the requested " 930 "3150 No privilege to perform the requested "
931 "access: x%x\n", reg_val); 931 "access: x%x\n", reg_val);
932 } else if (rc == -EIO) { 932 } else if (rc == -EIO) {
933 /* reset failed, there is nothing more we can do */ 933 /* reset failed, there is nothing more we can do */
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index bc270639c1c3..79c13c3263f1 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -2628,7 +2628,7 @@ err_get_xri_exit:
2628 * @phba: Pointer to HBA context object 2628 * @phba: Pointer to HBA context object
2629 * 2629 *
2630 * This function allocates BSG_MBOX_SIZE (4KB) page size dma buffer and. 2630 * This function allocates BSG_MBOX_SIZE (4KB) page size dma buffer and.
2631 * retruns the pointer to the buffer. 2631 * returns the pointer to the buffer.
2632 **/ 2632 **/
2633static struct lpfc_dmabuf * 2633static struct lpfc_dmabuf *
2634lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba) 2634lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba)
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index e6a1e0b38a19..515c9629e9fe 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -549,7 +549,7 @@ out_probe_one:
549 549
550/** 550/**
551 * megaraid_detach_one - release framework resources and call LLD release routine 551 * megaraid_detach_one - release framework resources and call LLD release routine
552 * @pdev : handle for our PCI cofiguration space 552 * @pdev : handle for our PCI configuration space
553 * 553 *
554 * This routine is called during driver unload. We free all the allocated 554 * This routine is called during driver unload. We free all the allocated
555 * resources and call the corresponding LLD so that it can also release all 555 * resources and call the corresponding LLD so that it can also release all
@@ -979,7 +979,7 @@ megaraid_fini_mbox(adapter_t *adapter)
979 * @adapter : soft state of the raid controller 979 * @adapter : soft state of the raid controller
980 * 980 *
981 * Allocate and align the shared mailbox. This maibox is used to issue 981 * Allocate and align the shared mailbox. This maibox is used to issue
982 * all the commands. For IO based controllers, the mailbox is also regsitered 982 * all the commands. For IO based controllers, the mailbox is also registered
983 * with the FW. Allocate memory for all commands as well. 983 * with the FW. Allocate memory for all commands as well.
984 * This is our big allocator. 984 * This is our big allocator.
985 */ 985 */
@@ -2027,7 +2027,7 @@ megaraid_mbox_prepare_pthru(adapter_t *adapter, scb_t *scb,
2027 * @scb : scsi control block 2027 * @scb : scsi control block
2028 * @scp : scsi command from the mid-layer 2028 * @scp : scsi command from the mid-layer
2029 * 2029 *
2030 * Prepare a command for the scsi physical devices. This rountine prepares 2030 * Prepare a command for the scsi physical devices. This routine prepares
2031 * commands for devices which can take extended CDBs (>10 bytes). 2031 * commands for devices which can take extended CDBs (>10 bytes).
2032 */ 2032 */
2033static void 2033static void
@@ -2586,7 +2586,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp)
2586} 2586}
2587 2587
2588/** 2588/**
2589 * megaraid_reset_handler - device reset hadler for mailbox based driver 2589 * megaraid_reset_handler - device reset handler for mailbox based driver
2590 * @scp : reference command 2590 * @scp : reference command
2591 * 2591 *
2592 * Reset handler for the mailbox based controller. First try to find out if 2592 * Reset handler for the mailbox based controller. First try to find out if
@@ -3446,7 +3446,7 @@ megaraid_mbox_display_scb(adapter_t *adapter, scb_t *scb)
3446 * megaraid_mbox_setup_device_map - manage device ids 3446 * megaraid_mbox_setup_device_map - manage device ids
3447 * @adapter : Driver's soft state 3447 * @adapter : Driver's soft state
3448 * 3448 *
3449 * Manange the device ids to have an appropriate mapping between the kernel 3449 * Manage the device ids to have an appropriate mapping between the kernel
3450 * scsi addresses and megaraid scsi and logical drive addresses. We export 3450 * scsi addresses and megaraid scsi and logical drive addresses. We export
3451 * scsi devices on their actual addresses, whereas the logical drives are 3451 * scsi devices on their actual addresses, whereas the logical drives are
3452 * exported on a virtual scsi channel. 3452 * exported on a virtual scsi channel.
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 25506c777381..dfffd0f37916 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -896,7 +896,7 @@ hinfo_to_cinfo(mraid_hba_info_t *hinfo, mcontroller_t *cinfo)
896 896
897/** 897/**
898 * mraid_mm_register_adp - Registration routine for low level drivers 898 * mraid_mm_register_adp - Registration routine for low level drivers
899 * @lld_adp : Adapter objejct 899 * @lld_adp : Adapter object
900 */ 900 */
901int 901int
902mraid_mm_register_adp(mraid_mmadp_t *lld_adp) 902mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h
index 12ff01cf6799..4eb84011cb07 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.h
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h
@@ -88,7 +88,7 @@ enum MR_RAID_FLAGS_IO_SUB_TYPE {
88#define MEGASAS_FUSION_IN_RESET 0 88#define MEGASAS_FUSION_IN_RESET 0
89 89
90/* 90/*
91 * Raid Context structure which describes MegaRAID specific IO Paramenters 91 * Raid Context structure which describes MegaRAID specific IO Parameters
92 * This resides at offset 0x60 where the SGL normally starts in MPT IO Frames 92 * This resides at offset 0x60 where the SGL normally starts in MPT IO Frames
93 */ 93 */
94 94
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index b989add77ec3..aa57bf0af574 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1895,7 +1895,7 @@ done:
1895 bsg_job->reply->reply_payload_rcv_len = 0; 1895 bsg_job->reply->reply_payload_rcv_len = 0;
1896 bsg_job->reply->result = (DID_OK) << 16; 1896 bsg_job->reply->result = (DID_OK) << 16;
1897 bsg_job->job_done(bsg_job); 1897 bsg_job->job_done(bsg_job);
1898 /* Always retrun success, vendor rsp carries correct status */ 1898 /* Always return success, vendor rsp carries correct status */
1899 return 0; 1899 return 0;
1900} 1900}
1901 1901
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 2482975d72b2..62ee7131b204 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -1865,7 +1865,7 @@ qlafx00_fx_disc(scsi_qla_host_t *vha, fc_port_t *fcport, uint16_t fx_type)
1865 p_sysid = utsname(); 1865 p_sysid = utsname();
1866 if (!p_sysid) { 1866 if (!p_sysid) {
1867 ql_log(ql_log_warn, vha, 0x303c, 1867 ql_log(ql_log_warn, vha, 0x303c,
1868 "Not able to get the system informtion\n"); 1868 "Not able to get the system information\n");
1869 goto done_free_sp; 1869 goto done_free_sp;
1870 } 1870 }
1871 break; 1871 break;
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index e3946e44e076..8c11355dec23 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -40,7 +40,7 @@
40 * to glue code. These bitbang setup() and cleanup() routines are always 40 * to glue code. These bitbang setup() and cleanup() routines are always
41 * used, though maybe they're called from controller-aware code. 41 * used, though maybe they're called from controller-aware code.
42 * 42 *
43 * chipselect() and friends may use use spi_device->controller_data and 43 * chipselect() and friends may use spi_device->controller_data and
44 * controller registers as appropriate. 44 * controller registers as appropriate.
45 * 45 *
46 * 46 *
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 10020547c60b..a260cde743e2 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -45,7 +45,7 @@ static int kgdboc_reset_connect(struct input_handler *handler,
45{ 45{
46 input_reset_device(dev); 46 input_reset_device(dev);
47 47
48 /* Retrun an error - we do not want to bind, just to reset */ 48 /* Return an error - we do not want to bind, just to reset */
49 return -ENODEV; 49 return -ENODEV;
50} 50}
51 51
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index d3f3b43cae0b..2e14fd89a8b4 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -219,7 +219,7 @@ static int fs_path_ensure_buf(struct fs_path *p, int len)
219 len = PAGE_ALIGN(len); 219 len = PAGE_ALIGN(len);
220 220
221 if (p->buf == p->inline_buf) { 221 if (p->buf == p->inline_buf) {
222 tmp_buf = kmalloc(len, GFP_NOFS); 222 tmp_buf = kmalloc(len, GFP_NOFS | __GFP_NOWARN);
223 if (!tmp_buf) { 223 if (!tmp_buf) {
224 tmp_buf = vmalloc(len); 224 tmp_buf = vmalloc(len);
225 if (!tmp_buf) 225 if (!tmp_buf)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 049c8a8bdc0e..2c2e6cbc6bed 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -162,7 +162,7 @@ void *ext4_kvmalloc(size_t size, gfp_t flags)
162{ 162{
163 void *ret; 163 void *ret;
164 164
165 ret = kmalloc(size, flags); 165 ret = kmalloc(size, flags | __GFP_NOWARN);
166 if (!ret) 166 if (!ret)
167 ret = __vmalloc(size, flags, PAGE_KERNEL); 167 ret = __vmalloc(size, flags, PAGE_KERNEL);
168 return ret; 168 return ret;
@@ -172,7 +172,7 @@ void *ext4_kvzalloc(size_t size, gfp_t flags)
172{ 172{
173 void *ret; 173 void *ret;
174 174
175 ret = kzalloc(size, flags); 175 ret = kzalloc(size, flags | __GFP_NOWARN);
176 if (!ret) 176 if (!ret)
177 ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); 177 ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL);
178 return ret; 178 return ret;
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 0cb4c1557f20..2e5fc268d324 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1859,7 +1859,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
1859 1859
1860 memset(&rlist, 0, sizeof(struct gfs2_rgrp_list)); 1860 memset(&rlist, 0, sizeof(struct gfs2_rgrp_list));
1861 1861
1862 ht = kzalloc(size, GFP_NOFS); 1862 ht = kzalloc(size, GFP_NOFS | __GFP_NOWARN);
1863 if (ht == NULL) 1863 if (ht == NULL)
1864 ht = vzalloc(size); 1864 ht = vzalloc(size);
1865 if (!ht) 1865 if (!ht)
diff --git a/include/linux/coda.h b/include/linux/coda.h
index cff544f81105..d30209b9cef8 100644
--- a/include/linux/coda.h
+++ b/include/linux/coda.h
@@ -60,7 +60,6 @@ Mellon the rights to redistribute these changes without encumbrance.
60 60
61#if defined(__linux__) 61#if defined(__linux__)
62typedef unsigned long long u_quad_t; 62typedef unsigned long long u_quad_t;
63#else
64#endif 63#endif
65#include <uapi/linux/coda.h> 64#include <uapi/linux/coda.h>
66#endif 65#endif
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index debf208b7611..31c0cd1c941a 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -69,7 +69,7 @@ typedef union ktime ktime_t; /* Kill this */
69 * @secs: seconds to set 69 * @secs: seconds to set
70 * @nsecs: nanoseconds to set 70 * @nsecs: nanoseconds to set
71 * 71 *
72 * Return the ktime_t representation of the value 72 * Return: The ktime_t representation of the value.
73 */ 73 */
74static inline ktime_t ktime_set(const long secs, const unsigned long nsecs) 74static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
75{ 75{
@@ -151,7 +151,7 @@ static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
151 * @lhs: minuend 151 * @lhs: minuend
152 * @rhs: subtrahend 152 * @rhs: subtrahend
153 * 153 *
154 * Returns the remainder of the subtraction 154 * Return: The remainder of the subtraction.
155 */ 155 */
156static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs) 156static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
157{ 157{
@@ -169,7 +169,7 @@ static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
169 * @add1: addend1 169 * @add1: addend1
170 * @add2: addend2 170 * @add2: addend2
171 * 171 *
172 * Returns the sum of @add1 and @add2. 172 * Return: The sum of @add1 and @add2.
173 */ 173 */
174static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2) 174static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
175{ 175{
@@ -195,7 +195,7 @@ static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
195 * @kt: addend 195 * @kt: addend
196 * @nsec: the scalar nsec value to add 196 * @nsec: the scalar nsec value to add
197 * 197 *
198 * Returns the sum of @kt and @nsec in ktime_t format 198 * Return: The sum of @kt and @nsec in ktime_t format.
199 */ 199 */
200extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec); 200extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
201 201
@@ -204,7 +204,7 @@ extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
204 * @kt: minuend 204 * @kt: minuend
205 * @nsec: the scalar nsec value to subtract 205 * @nsec: the scalar nsec value to subtract
206 * 206 *
207 * Returns the subtraction of @nsec from @kt in ktime_t format 207 * Return: The subtraction of @nsec from @kt in ktime_t format.
208 */ 208 */
209extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec); 209extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
210 210
@@ -212,7 +212,7 @@ extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
212 * timespec_to_ktime - convert a timespec to ktime_t format 212 * timespec_to_ktime - convert a timespec to ktime_t format
213 * @ts: the timespec variable to convert 213 * @ts: the timespec variable to convert
214 * 214 *
215 * Returns a ktime_t variable with the converted timespec value 215 * Return: A ktime_t variable with the converted timespec value.
216 */ 216 */
217static inline ktime_t timespec_to_ktime(const struct timespec ts) 217static inline ktime_t timespec_to_ktime(const struct timespec ts)
218{ 218{
@@ -224,7 +224,7 @@ static inline ktime_t timespec_to_ktime(const struct timespec ts)
224 * timeval_to_ktime - convert a timeval to ktime_t format 224 * timeval_to_ktime - convert a timeval to ktime_t format
225 * @tv: the timeval variable to convert 225 * @tv: the timeval variable to convert
226 * 226 *
227 * Returns a ktime_t variable with the converted timeval value 227 * Return: A ktime_t variable with the converted timeval value.
228 */ 228 */
229static inline ktime_t timeval_to_ktime(const struct timeval tv) 229static inline ktime_t timeval_to_ktime(const struct timeval tv)
230{ 230{
@@ -237,7 +237,7 @@ static inline ktime_t timeval_to_ktime(const struct timeval tv)
237 * ktime_to_timespec - convert a ktime_t variable to timespec format 237 * ktime_to_timespec - convert a ktime_t variable to timespec format
238 * @kt: the ktime_t variable to convert 238 * @kt: the ktime_t variable to convert
239 * 239 *
240 * Returns the timespec representation of the ktime value 240 * Return: The timespec representation of the ktime value.
241 */ 241 */
242static inline struct timespec ktime_to_timespec(const ktime_t kt) 242static inline struct timespec ktime_to_timespec(const ktime_t kt)
243{ 243{
@@ -249,7 +249,7 @@ static inline struct timespec ktime_to_timespec(const ktime_t kt)
249 * ktime_to_timeval - convert a ktime_t variable to timeval format 249 * ktime_to_timeval - convert a ktime_t variable to timeval format
250 * @kt: the ktime_t variable to convert 250 * @kt: the ktime_t variable to convert
251 * 251 *
252 * Returns the timeval representation of the ktime value 252 * Return: The timeval representation of the ktime value.
253 */ 253 */
254static inline struct timeval ktime_to_timeval(const ktime_t kt) 254static inline struct timeval ktime_to_timeval(const ktime_t kt)
255{ 255{
@@ -262,7 +262,7 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
262 * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds 262 * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds
263 * @kt: the ktime_t variable to convert 263 * @kt: the ktime_t variable to convert
264 * 264 *
265 * Returns the scalar nanoseconds representation of @kt 265 * Return: The scalar nanoseconds representation of @kt.
266 */ 266 */
267static inline s64 ktime_to_ns(const ktime_t kt) 267static inline s64 ktime_to_ns(const ktime_t kt)
268{ 268{
@@ -276,7 +276,9 @@ static inline s64 ktime_to_ns(const ktime_t kt)
276 * @cmp1: comparable1 276 * @cmp1: comparable1
277 * @cmp2: comparable2 277 * @cmp2: comparable2
278 * 278 *
279 * Compare two ktime_t variables, returns 1 if equal 279 * Compare two ktime_t variables.
280 *
281 * Return: 1 if equal.
280 */ 282 */
281static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2) 283static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
282{ 284{
@@ -288,7 +290,7 @@ static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
288 * @cmp1: comparable1 290 * @cmp1: comparable1
289 * @cmp2: comparable2 291 * @cmp2: comparable2
290 * 292 *
291 * Returns ... 293 * Return: ...
292 * cmp1 < cmp2: return <0 294 * cmp1 < cmp2: return <0
293 * cmp1 == cmp2: return 0 295 * cmp1 == cmp2: return 0
294 * cmp1 > cmp2: return >0 296 * cmp1 > cmp2: return >0
@@ -342,7 +344,7 @@ extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
342 * @kt: the ktime_t variable to convert 344 * @kt: the ktime_t variable to convert
343 * @ts: the timespec variable to store the result in 345 * @ts: the timespec variable to store the result in
344 * 346 *
345 * Returns true if there was a successful conversion, false if kt was 0. 347 * Return: %true if there was a successful conversion, %false if kt was 0.
346 */ 348 */
347static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt, 349static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,
348 struct timespec *ts) 350 struct timespec *ts)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 29b79852a845..987293d03ebc 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -541,6 +541,8 @@ static int worker_pool_assign_id(struct worker_pool *pool)
541 * This must be called either with pwq_lock held or sched RCU read locked. 541 * This must be called either with pwq_lock held or sched RCU read locked.
542 * If the pwq needs to be used beyond the locking in effect, the caller is 542 * If the pwq needs to be used beyond the locking in effect, the caller is
543 * responsible for guaranteeing that the pwq stays online. 543 * responsible for guaranteeing that the pwq stays online.
544 *
545 * Return: The unbound pool_workqueue for @node.
544 */ 546 */
545static struct pool_workqueue *unbound_pwq_by_node(struct workqueue_struct *wq, 547static struct pool_workqueue *unbound_pwq_by_node(struct workqueue_struct *wq,
546 int node) 548 int node)
@@ -639,8 +641,6 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
639 * get_work_pool - return the worker_pool a given work was associated with 641 * get_work_pool - return the worker_pool a given work was associated with
640 * @work: the work item of interest 642 * @work: the work item of interest
641 * 643 *
642 * Return the worker_pool @work was last associated with. %NULL if none.
643 *
644 * Pools are created and destroyed under wq_pool_mutex, and allows read 644 * Pools are created and destroyed under wq_pool_mutex, and allows read
645 * access under sched-RCU read lock. As such, this function should be 645 * access under sched-RCU read lock. As such, this function should be
646 * called under wq_pool_mutex or with preemption disabled. 646 * called under wq_pool_mutex or with preemption disabled.
@@ -649,6 +649,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
649 * mentioned locking is in effect. If the returned pool needs to be used 649 * mentioned locking is in effect. If the returned pool needs to be used
650 * beyond the critical section, the caller is responsible for ensuring the 650 * beyond the critical section, the caller is responsible for ensuring the
651 * returned pool is and stays online. 651 * returned pool is and stays online.
652 *
653 * Return: The worker_pool @work was last associated with. %NULL if none.
652 */ 654 */
653static struct worker_pool *get_work_pool(struct work_struct *work) 655static struct worker_pool *get_work_pool(struct work_struct *work)
654{ 656{
@@ -672,7 +674,7 @@ static struct worker_pool *get_work_pool(struct work_struct *work)
672 * get_work_pool_id - return the worker pool ID a given work is associated with 674 * get_work_pool_id - return the worker pool ID a given work is associated with
673 * @work: the work item of interest 675 * @work: the work item of interest
674 * 676 *
675 * Return the worker_pool ID @work was last associated with. 677 * Return: The worker_pool ID @work was last associated with.
676 * %WORK_OFFQ_POOL_NONE if none. 678 * %WORK_OFFQ_POOL_NONE if none.
677 */ 679 */
678static int get_work_pool_id(struct work_struct *work) 680static int get_work_pool_id(struct work_struct *work)
@@ -831,7 +833,7 @@ void wq_worker_waking_up(struct task_struct *task, int cpu)
831 * CONTEXT: 833 * CONTEXT:
832 * spin_lock_irq(rq->lock) 834 * spin_lock_irq(rq->lock)
833 * 835 *
834 * RETURNS: 836 * Return:
835 * Worker task on @cpu to wake up, %NULL if none. 837 * Worker task on @cpu to wake up, %NULL if none.
836 */ 838 */
837struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) 839struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu)
@@ -966,8 +968,8 @@ static inline void worker_clr_flags(struct worker *worker, unsigned int flags)
966 * CONTEXT: 968 * CONTEXT:
967 * spin_lock_irq(pool->lock). 969 * spin_lock_irq(pool->lock).
968 * 970 *
969 * RETURNS: 971 * Return:
970 * Pointer to worker which is executing @work if found, NULL 972 * Pointer to worker which is executing @work if found, %NULL
971 * otherwise. 973 * otherwise.
972 */ 974 */
973static struct worker *find_worker_executing_work(struct worker_pool *pool, 975static struct worker *find_worker_executing_work(struct worker_pool *pool,
@@ -1155,14 +1157,16 @@ out_put:
1155 * @flags: place to store irq state 1157 * @flags: place to store irq state
1156 * 1158 *
1157 * Try to grab PENDING bit of @work. This function can handle @work in any 1159 * Try to grab PENDING bit of @work. This function can handle @work in any
1158 * stable state - idle, on timer or on worklist. Return values are 1160 * stable state - idle, on timer or on worklist.
1159 * 1161 *
1162 * Return:
1160 * 1 if @work was pending and we successfully stole PENDING 1163 * 1 if @work was pending and we successfully stole PENDING
1161 * 0 if @work was idle and we claimed PENDING 1164 * 0 if @work was idle and we claimed PENDING
1162 * -EAGAIN if PENDING couldn't be grabbed at the moment, safe to busy-retry 1165 * -EAGAIN if PENDING couldn't be grabbed at the moment, safe to busy-retry
1163 * -ENOENT if someone else is canceling @work, this state may persist 1166 * -ENOENT if someone else is canceling @work, this state may persist
1164 * for arbitrarily long 1167 * for arbitrarily long
1165 * 1168 *
1169 * Note:
1166 * On >= 0 return, the caller owns @work's PENDING bit. To avoid getting 1170 * On >= 0 return, the caller owns @work's PENDING bit. To avoid getting
1167 * interrupted while holding PENDING and @work off queue, irq must be 1171 * interrupted while holding PENDING and @work off queue, irq must be
1168 * disabled on entry. This, combined with delayed_work->timer being 1172 * disabled on entry. This, combined with delayed_work->timer being
@@ -1404,10 +1408,10 @@ retry:
1404 * @wq: workqueue to use 1408 * @wq: workqueue to use
1405 * @work: work to queue 1409 * @work: work to queue
1406 * 1410 *
1407 * Returns %false if @work was already on a queue, %true otherwise.
1408 *
1409 * We queue the work to a specific CPU, the caller must ensure it 1411 * We queue the work to a specific CPU, the caller must ensure it
1410 * can't go away. 1412 * can't go away.
1413 *
1414 * Return: %false if @work was already on a queue, %true otherwise.
1411 */ 1415 */
1412bool queue_work_on(int cpu, struct workqueue_struct *wq, 1416bool queue_work_on(int cpu, struct workqueue_struct *wq,
1413 struct work_struct *work) 1417 struct work_struct *work)
@@ -1477,7 +1481,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
1477 * @dwork: work to queue 1481 * @dwork: work to queue
1478 * @delay: number of jiffies to wait before queueing 1482 * @delay: number of jiffies to wait before queueing
1479 * 1483 *
1480 * Returns %false if @work was already on a queue, %true otherwise. If 1484 * Return: %false if @work was already on a queue, %true otherwise. If
1481 * @delay is zero and @dwork is idle, it will be scheduled for immediate 1485 * @delay is zero and @dwork is idle, it will be scheduled for immediate
1482 * execution. 1486 * execution.
1483 */ 1487 */
@@ -1513,7 +1517,7 @@ EXPORT_SYMBOL(queue_delayed_work_on);
1513 * zero, @work is guaranteed to be scheduled immediately regardless of its 1517 * zero, @work is guaranteed to be scheduled immediately regardless of its
1514 * current state. 1518 * current state.
1515 * 1519 *
1516 * Returns %false if @dwork was idle and queued, %true if @dwork was 1520 * Return: %false if @dwork was idle and queued, %true if @dwork was
1517 * pending and its timer was modified. 1521 * pending and its timer was modified.
1518 * 1522 *
1519 * This function is safe to call from any context including IRQ handler. 1523 * This function is safe to call from any context including IRQ handler.
@@ -1628,7 +1632,7 @@ static void worker_leave_idle(struct worker *worker)
1628 * Might sleep. Called without any lock but returns with pool->lock 1632 * Might sleep. Called without any lock but returns with pool->lock
1629 * held. 1633 * held.
1630 * 1634 *
1631 * RETURNS: 1635 * Return:
1632 * %true if the associated pool is online (@worker is successfully 1636 * %true if the associated pool is online (@worker is successfully
1633 * bound), %false if offline. 1637 * bound), %false if offline.
1634 */ 1638 */
@@ -1689,7 +1693,7 @@ static struct worker *alloc_worker(void)
1689 * CONTEXT: 1693 * CONTEXT:
1690 * Might sleep. Does GFP_KERNEL allocations. 1694 * Might sleep. Does GFP_KERNEL allocations.
1691 * 1695 *
1692 * RETURNS: 1696 * Return:
1693 * Pointer to the newly created worker. 1697 * Pointer to the newly created worker.
1694 */ 1698 */
1695static struct worker *create_worker(struct worker_pool *pool) 1699static struct worker *create_worker(struct worker_pool *pool)
@@ -1789,6 +1793,8 @@ static void start_worker(struct worker *worker)
1789 * @pool: the target pool 1793 * @pool: the target pool
1790 * 1794 *
1791 * Grab the managership of @pool and create and start a new worker for it. 1795 * Grab the managership of @pool and create and start a new worker for it.
1796 *
1797 * Return: 0 on success. A negative error code otherwise.
1792 */ 1798 */
1793static int create_and_start_worker(struct worker_pool *pool) 1799static int create_and_start_worker(struct worker_pool *pool)
1794{ 1800{
@@ -1933,7 +1939,7 @@ static void pool_mayday_timeout(unsigned long __pool)
1933 * multiple times. Does GFP_KERNEL allocations. Called only from 1939 * multiple times. Does GFP_KERNEL allocations. Called only from
1934 * manager. 1940 * manager.
1935 * 1941 *
1936 * RETURNS: 1942 * Return:
1937 * %false if no action was taken and pool->lock stayed locked, %true 1943 * %false if no action was taken and pool->lock stayed locked, %true
1938 * otherwise. 1944 * otherwise.
1939 */ 1945 */
@@ -1990,7 +1996,7 @@ restart:
1990 * spin_lock_irq(pool->lock) which may be released and regrabbed 1996 * spin_lock_irq(pool->lock) which may be released and regrabbed
1991 * multiple times. Called only from manager. 1997 * multiple times. Called only from manager.
1992 * 1998 *
1993 * RETURNS: 1999 * Return:
1994 * %false if no action was taken and pool->lock stayed locked, %true 2000 * %false if no action was taken and pool->lock stayed locked, %true
1995 * otherwise. 2001 * otherwise.
1996 */ 2002 */
@@ -2033,7 +2039,7 @@ static bool maybe_destroy_workers(struct worker_pool *pool)
2033 * spin_lock_irq(pool->lock) which may be released and regrabbed 2039 * spin_lock_irq(pool->lock) which may be released and regrabbed
2034 * multiple times. Does GFP_KERNEL allocations. 2040 * multiple times. Does GFP_KERNEL allocations.
2035 * 2041 *
2036 * RETURNS: 2042 * Return:
2037 * %false if the pool don't need management and the caller can safely start 2043 * %false if the pool don't need management and the caller can safely start
2038 * processing works, %true indicates that the function released pool->lock 2044 * processing works, %true indicates that the function released pool->lock
2039 * and reacquired it to perform some management function and that the 2045 * and reacquired it to perform some management function and that the
@@ -2259,6 +2265,8 @@ static void process_scheduled_works(struct worker *worker)
2259 * work items regardless of their specific target workqueue. The only 2265 * work items regardless of their specific target workqueue. The only
2260 * exception is work items which belong to workqueues with a rescuer which 2266 * exception is work items which belong to workqueues with a rescuer which
2261 * will be explained in rescuer_thread(). 2267 * will be explained in rescuer_thread().
2268 *
2269 * Return: 0
2262 */ 2270 */
2263static int worker_thread(void *__worker) 2271static int worker_thread(void *__worker)
2264{ 2272{
@@ -2357,6 +2365,8 @@ sleep:
2357 * those works so that forward progress can be guaranteed. 2365 * those works so that forward progress can be guaranteed.
2358 * 2366 *
2359 * This should happen rarely. 2367 * This should happen rarely.
2368 *
2369 * Return: 0
2360 */ 2370 */
2361static int rescuer_thread(void *__rescuer) 2371static int rescuer_thread(void *__rescuer)
2362{ 2372{
@@ -2529,7 +2539,7 @@ static void insert_wq_barrier(struct pool_workqueue *pwq,
2529 * CONTEXT: 2539 * CONTEXT:
2530 * mutex_lock(wq->mutex). 2540 * mutex_lock(wq->mutex).
2531 * 2541 *
2532 * RETURNS: 2542 * Return:
2533 * %true if @flush_color >= 0 and there's something to flush. %false 2543 * %true if @flush_color >= 0 and there's something to flush. %false
2534 * otherwise. 2544 * otherwise.
2535 */ 2545 */
@@ -2850,7 +2860,7 @@ static bool __flush_work(struct work_struct *work)
2850 * Wait until @work has finished execution. @work is guaranteed to be idle 2860 * Wait until @work has finished execution. @work is guaranteed to be idle
2851 * on return if it hasn't been requeued since flush started. 2861 * on return if it hasn't been requeued since flush started.
2852 * 2862 *
2853 * RETURNS: 2863 * Return:
2854 * %true if flush_work() waited for the work to finish execution, 2864 * %true if flush_work() waited for the work to finish execution,
2855 * %false if it was already idle. 2865 * %false if it was already idle.
2856 */ 2866 */
@@ -2902,7 +2912,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork)
2902 * The caller must ensure that the workqueue on which @work was last 2912 * The caller must ensure that the workqueue on which @work was last
2903 * queued can't be destroyed before this function returns. 2913 * queued can't be destroyed before this function returns.
2904 * 2914 *
2905 * RETURNS: 2915 * Return:
2906 * %true if @work was pending, %false otherwise. 2916 * %true if @work was pending, %false otherwise.
2907 */ 2917 */
2908bool cancel_work_sync(struct work_struct *work) 2918bool cancel_work_sync(struct work_struct *work)
@@ -2919,7 +2929,7 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
2919 * immediate execution. Like flush_work(), this function only 2929 * immediate execution. Like flush_work(), this function only
2920 * considers the last queueing instance of @dwork. 2930 * considers the last queueing instance of @dwork.
2921 * 2931 *
2922 * RETURNS: 2932 * Return:
2923 * %true if flush_work() waited for the work to finish execution, 2933 * %true if flush_work() waited for the work to finish execution,
2924 * %false if it was already idle. 2934 * %false if it was already idle.
2925 */ 2935 */
@@ -2937,11 +2947,15 @@ EXPORT_SYMBOL(flush_delayed_work);
2937 * cancel_delayed_work - cancel a delayed work 2947 * cancel_delayed_work - cancel a delayed work
2938 * @dwork: delayed_work to cancel 2948 * @dwork: delayed_work to cancel
2939 * 2949 *
2940 * Kill off a pending delayed_work. Returns %true if @dwork was pending 2950 * Kill off a pending delayed_work.
2941 * and canceled; %false if wasn't pending. Note that the work callback 2951 *
2942 * function may still be running on return, unless it returns %true and the 2952 * Return: %true if @dwork was pending and canceled; %false if it wasn't
2943 * work doesn't re-arm itself. Explicitly flush or use 2953 * pending.
2944 * cancel_delayed_work_sync() to wait on it. 2954 *
2955 * Note:
2956 * The work callback function may still be running on return, unless
2957 * it returns %true and the work doesn't re-arm itself. Explicitly flush or
2958 * use cancel_delayed_work_sync() to wait on it.
2945 * 2959 *
2946 * This function is safe to call from any context including IRQ handler. 2960 * This function is safe to call from any context including IRQ handler.
2947 */ 2961 */
@@ -2970,7 +2984,7 @@ EXPORT_SYMBOL(cancel_delayed_work);
2970 * 2984 *
2971 * This is cancel_work_sync() for delayed works. 2985 * This is cancel_work_sync() for delayed works.
2972 * 2986 *
2973 * RETURNS: 2987 * Return:
2974 * %true if @dwork was pending, %false otherwise. 2988 * %true if @dwork was pending, %false otherwise.
2975 */ 2989 */
2976bool cancel_delayed_work_sync(struct delayed_work *dwork) 2990bool cancel_delayed_work_sync(struct delayed_work *dwork)
@@ -2987,7 +3001,7 @@ EXPORT_SYMBOL(cancel_delayed_work_sync);
2987 * system workqueue and blocks until all CPUs have completed. 3001 * system workqueue and blocks until all CPUs have completed.
2988 * schedule_on_each_cpu() is very slow. 3002 * schedule_on_each_cpu() is very slow.
2989 * 3003 *
2990 * RETURNS: 3004 * Return:
2991 * 0 on success, -errno on failure. 3005 * 0 on success, -errno on failure.
2992 */ 3006 */
2993int schedule_on_each_cpu(work_func_t func) 3007int schedule_on_each_cpu(work_func_t func)
@@ -3055,7 +3069,7 @@ EXPORT_SYMBOL(flush_scheduled_work);
3055 * Executes the function immediately if process context is available, 3069 * Executes the function immediately if process context is available,
3056 * otherwise schedules the function for delayed execution. 3070 * otherwise schedules the function for delayed execution.
3057 * 3071 *
3058 * Returns: 0 - function was executed 3072 * Return: 0 - function was executed
3059 * 1 - function was scheduled for execution 3073 * 1 - function was scheduled for execution
3060 */ 3074 */
3061int execute_in_process_context(work_func_t fn, struct execute_work *ew) 3075int execute_in_process_context(work_func_t fn, struct execute_work *ew)
@@ -3315,7 +3329,7 @@ static void wq_device_release(struct device *dev)
3315 * apply_workqueue_attrs() may race against userland updating the 3329 * apply_workqueue_attrs() may race against userland updating the
3316 * attributes. 3330 * attributes.
3317 * 3331 *
3318 * Returns 0 on success, -errno on failure. 3332 * Return: 0 on success, -errno on failure.
3319 */ 3333 */
3320int workqueue_sysfs_register(struct workqueue_struct *wq) 3334int workqueue_sysfs_register(struct workqueue_struct *wq)
3321{ 3335{
@@ -3408,7 +3422,9 @@ void free_workqueue_attrs(struct workqueue_attrs *attrs)
3408 * @gfp_mask: allocation mask to use 3422 * @gfp_mask: allocation mask to use
3409 * 3423 *
3410 * Allocate a new workqueue_attrs, initialize with default settings and 3424 * Allocate a new workqueue_attrs, initialize with default settings and
3411 * return it. Returns NULL on failure. 3425 * return it.
3426 *
3427 * Return: The allocated new workqueue_attr on success. %NULL on failure.
3412 */ 3428 */
3413struct workqueue_attrs *alloc_workqueue_attrs(gfp_t gfp_mask) 3429struct workqueue_attrs *alloc_workqueue_attrs(gfp_t gfp_mask)
3414{ 3430{
@@ -3467,7 +3483,8 @@ static bool wqattrs_equal(const struct workqueue_attrs *a,
3467 * @pool: worker_pool to initialize 3483 * @pool: worker_pool to initialize
3468 * 3484 *
3469 * Initiailize a newly zalloc'd @pool. It also allocates @pool->attrs. 3485 * Initiailize a newly zalloc'd @pool. It also allocates @pool->attrs.
3470 * Returns 0 on success, -errno on failure. Even on failure, all fields 3486 *
3487 * Return: 0 on success, -errno on failure. Even on failure, all fields
3471 * inside @pool proper are initialized and put_unbound_pool() can be called 3488 * inside @pool proper are initialized and put_unbound_pool() can be called
3472 * on @pool safely to release it. 3489 * on @pool safely to release it.
3473 */ 3490 */
@@ -3574,9 +3591,12 @@ static void put_unbound_pool(struct worker_pool *pool)
3574 * Obtain a worker_pool which has the same attributes as @attrs, bump the 3591 * Obtain a worker_pool which has the same attributes as @attrs, bump the
3575 * reference count and return it. If there already is a matching 3592 * reference count and return it. If there already is a matching
3576 * worker_pool, it will be used; otherwise, this function attempts to 3593 * worker_pool, it will be used; otherwise, this function attempts to
3577 * create a new one. On failure, returns NULL. 3594 * create a new one.
3578 * 3595 *
3579 * Should be called with wq_pool_mutex held. 3596 * Should be called with wq_pool_mutex held.
3597 *
3598 * Return: On success, a worker_pool with the same attributes as @attrs.
3599 * On failure, %NULL.
3580 */ 3600 */
3581static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs) 3601static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs)
3582{ 3602{
@@ -3812,9 +3832,7 @@ static void free_unbound_pwq(struct pool_workqueue *pwq)
3812 * 3832 *
3813 * Calculate the cpumask a workqueue with @attrs should use on @node. If 3833 * Calculate the cpumask a workqueue with @attrs should use on @node. If
3814 * @cpu_going_down is >= 0, that cpu is considered offline during 3834 * @cpu_going_down is >= 0, that cpu is considered offline during
3815 * calculation. The result is stored in @cpumask. This function returns 3835 * calculation. The result is stored in @cpumask.
3816 * %true if the resulting @cpumask is different from @attrs->cpumask,
3817 * %false if equal.
3818 * 3836 *
3819 * If NUMA affinity is not enabled, @attrs->cpumask is always used. If 3837 * If NUMA affinity is not enabled, @attrs->cpumask is always used. If
3820 * enabled and @node has online CPUs requested by @attrs, the returned 3838 * enabled and @node has online CPUs requested by @attrs, the returned
@@ -3823,6 +3841,9 @@ static void free_unbound_pwq(struct pool_workqueue *pwq)
3823 * 3841 *
3824 * The caller is responsible for ensuring that the cpumask of @node stays 3842 * The caller is responsible for ensuring that the cpumask of @node stays
3825 * stable. 3843 * stable.
3844 *
3845 * Return: %true if the resulting @cpumask is different from @attrs->cpumask,
3846 * %false if equal.
3826 */ 3847 */
3827static bool wq_calc_node_cpumask(const struct workqueue_attrs *attrs, int node, 3848static bool wq_calc_node_cpumask(const struct workqueue_attrs *attrs, int node,
3828 int cpu_going_down, cpumask_t *cpumask) 3849 int cpu_going_down, cpumask_t *cpumask)
@@ -3876,8 +3897,9 @@ static struct pool_workqueue *numa_pwq_tbl_install(struct workqueue_struct *wq,
3876 * items finish. Note that a work item which repeatedly requeues itself 3897 * items finish. Note that a work item which repeatedly requeues itself
3877 * back-to-back will stay on its current pwq. 3898 * back-to-back will stay on its current pwq.
3878 * 3899 *
3879 * Performs GFP_KERNEL allocations. Returns 0 on success and -errno on 3900 * Performs GFP_KERNEL allocations.
3880 * failure. 3901 *
3902 * Return: 0 on success and -errno on failure.
3881 */ 3903 */
3882int apply_workqueue_attrs(struct workqueue_struct *wq, 3904int apply_workqueue_attrs(struct workqueue_struct *wq,
3883 const struct workqueue_attrs *attrs) 3905 const struct workqueue_attrs *attrs)
@@ -4345,6 +4367,8 @@ EXPORT_SYMBOL_GPL(workqueue_set_max_active);
4345 * 4367 *
4346 * Determine whether %current is a workqueue rescuer. Can be used from 4368 * Determine whether %current is a workqueue rescuer. Can be used from
4347 * work functions to determine whether it's being run off the rescuer task. 4369 * work functions to determine whether it's being run off the rescuer task.
4370 *
4371 * Return: %true if %current is a workqueue rescuer. %false otherwise.
4348 */ 4372 */
4349bool current_is_workqueue_rescuer(void) 4373bool current_is_workqueue_rescuer(void)
4350{ 4374{
@@ -4368,7 +4392,7 @@ bool current_is_workqueue_rescuer(void)
4368 * workqueue being congested on one CPU doesn't mean the workqueue is also 4392 * workqueue being congested on one CPU doesn't mean the workqueue is also
4369 * contested on other CPUs / NUMA nodes. 4393 * contested on other CPUs / NUMA nodes.
4370 * 4394 *
4371 * RETURNS: 4395 * Return:
4372 * %true if congested, %false otherwise. 4396 * %true if congested, %false otherwise.
4373 */ 4397 */
4374bool workqueue_congested(int cpu, struct workqueue_struct *wq) 4398bool workqueue_congested(int cpu, struct workqueue_struct *wq)
@@ -4401,7 +4425,7 @@ EXPORT_SYMBOL_GPL(workqueue_congested);
4401 * synchronization around this function and the test result is 4425 * synchronization around this function and the test result is
4402 * unreliable and only useful as advisory hints or for debugging. 4426 * unreliable and only useful as advisory hints or for debugging.
4403 * 4427 *
4404 * RETURNS: 4428 * Return:
4405 * OR'd bitmask of WORK_BUSY_* bits. 4429 * OR'd bitmask of WORK_BUSY_* bits.
4406 */ 4430 */
4407unsigned int work_busy(struct work_struct *work) 4431unsigned int work_busy(struct work_struct *work)
@@ -4779,9 +4803,10 @@ static void work_for_cpu_fn(struct work_struct *work)
4779 * @fn: the function to run 4803 * @fn: the function to run
4780 * @arg: the function arg 4804 * @arg: the function arg
4781 * 4805 *
4782 * This will return the value @fn returns.
4783 * It is up to the caller to ensure that the cpu doesn't go offline. 4806 * It is up to the caller to ensure that the cpu doesn't go offline.
4784 * The caller must not hold any locks which would prevent @fn from completing. 4807 * The caller must not hold any locks which would prevent @fn from completing.
4808 *
4809 * Return: The value @fn returns.
4785 */ 4810 */
4786long work_on_cpu(int cpu, long (*fn)(void *), void *arg) 4811long work_on_cpu(int cpu, long (*fn)(void *), void *arg)
4787{ 4812{
@@ -4853,7 +4878,7 @@ void freeze_workqueues_begin(void)
4853 * CONTEXT: 4878 * CONTEXT:
4854 * Grabs and releases wq_pool_mutex. 4879 * Grabs and releases wq_pool_mutex.
4855 * 4880 *
4856 * RETURNS: 4881 * Return:
4857 * %true if some freezable workqueues are still busy. %false if freezing 4882 * %true if some freezable workqueues are still busy. %false if freezing
4858 * is complete. 4883 * is complete.
4859 */ 4884 */
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 55d7c8026ab0..d84c5e5331bb 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1265,7 +1265,7 @@ void memory_failure_queue(unsigned long pfn, int trapno, int flags)
1265 if (kfifo_put(&mf_cpu->fifo, &entry)) 1265 if (kfifo_put(&mf_cpu->fifo, &entry))
1266 schedule_work_on(smp_processor_id(), &mf_cpu->work); 1266 schedule_work_on(smp_processor_id(), &mf_cpu->work);
1267 else 1267 else
1268 pr_err("Memory failure: buffer overflow when queuing memory failure at 0x%#lx\n", 1268 pr_err("Memory failure: buffer overflow when queuing memory failure at %#lx\n",
1269 pfn); 1269 pfn);
1270 spin_unlock_irqrestore(&mf_cpu->lock, proc_flags); 1270 spin_unlock_irqrestore(&mf_cpu->lock, proc_flags);
1271 put_cpu_var(memory_failure_cpu); 1271 put_cpu_var(memory_failure_cpu);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b100255dedda..c2b59dbda196 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -768,7 +768,7 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
768} 768}
769 769
770#ifdef CONFIG_CMA 770#ifdef CONFIG_CMA
771/* Free whole pageblock and set it's migration type to MIGRATE_CMA. */ 771/* Free whole pageblock and set its migration type to MIGRATE_CMA. */
772void __init init_cma_reserved_pageblock(struct page *page) 772void __init init_cma_reserved_pageblock(struct page *page)
773{ 773{
774 unsigned i = pageblock_nr_pages; 774 unsigned i = pageblock_nr_pages;
diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 383bdbb98b04..0cee10ffb98d 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -226,9 +226,9 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
226 int ret; 226 int ret;
227 227
228 /* 228 /*
229 * Note: pageblock_nr_page != MAX_ORDER. Then, chunks of free page 229 * Note: pageblock_nr_pages != MAX_ORDER. Then, chunks of free pages
230 * is not aligned to pageblock_nr_pages. 230 * are not aligned to pageblock_nr_pages.
231 * Then we just check pagetype fist. 231 * Then we just check migratetype first.
232 */ 232 */
233 for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) { 233 for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
234 page = __first_valid_page(pfn, pageblock_nr_pages); 234 page = __first_valid_page(pfn, pageblock_nr_pages);
@@ -238,7 +238,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
238 page = __first_valid_page(start_pfn, end_pfn - start_pfn); 238 page = __first_valid_page(start_pfn, end_pfn - start_pfn);
239 if ((pfn < end_pfn) || !page) 239 if ((pfn < end_pfn) || !page)
240 return -EBUSY; 240 return -EBUSY;
241 /* Check all pages are free or Marked as ISOLATED */ 241 /* Check all pages are free or marked as ISOLATED */
242 zone = page_zone(page); 242 zone = page_zone(page);
243 spin_lock_irqsave(&zone->lock, flags); 243 spin_lock_irqsave(&zone->lock, flags);
244 ret = __test_page_isolated_in_pageblock(start_pfn, end_pfn, 244 ret = __test_page_isolated_in_pageblock(start_pfn, end_pfn,
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index ef53ab8d0aae..ddd73cb2d7ba 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -438,7 +438,8 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt)
438 if (mask != q->tab_mask) { 438 if (mask != q->tab_mask) {
439 struct sk_buff **ntab; 439 struct sk_buff **ntab;
440 440
441 ntab = kcalloc(mask + 1, sizeof(struct sk_buff *), GFP_KERNEL); 441 ntab = kcalloc(mask + 1, sizeof(struct sk_buff *),
442 GFP_KERNEL | __GFP_NOWARN);
442 if (!ntab) 443 if (!ntab)
443 ntab = vzalloc((mask + 1) * sizeof(struct sk_buff *)); 444 ntab = vzalloc((mask + 1) * sizeof(struct sk_buff *));
444 if (!ntab) 445 if (!ntab)
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index ca8929b9a5d6..61262f396004 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1842,7 +1842,7 @@ static int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev)
1842 1842
1843 default: 1843 default:
1844 if (!request_region(io_port, 8, "ens137x: gameport")) { 1844 if (!request_region(io_port, 8, "ens137x: gameport")) {
1845 printk(KERN_WARNING "ens137x: gameport io port 0x%#x in use\n", 1845 printk(KERN_WARNING "ens137x: gameport io port %#x in use\n",
1846 io_port); 1846 io_port);
1847 return -EBUSY; 1847 return -EBUSY;
1848 } 1848 }
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 3c511d0caf9e..5ae6f042c586 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1940,7 +1940,7 @@ static int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legac
1940 1940
1941 r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport"); 1941 r = request_region(JOYSTICK_ADDR, 8, "VIA686 gameport");
1942 if (!r) { 1942 if (!r) {
1943 printk(KERN_WARNING "via82xx: cannot reserve joystick port 0x%#x\n", 1943 printk(KERN_WARNING "via82xx: cannot reserve joystick port %#x\n",
1944 JOYSTICK_ADDR); 1944 JOYSTICK_ADDR);
1945 return -EBUSY; 1945 return -EBUSY;
1946 } 1946 }