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 ...

Linus Torvalds committed 13 years ago

Commit 2e515bf2 parents 22e04f6 f8ea61e106 files · +269 −204Browse files

Unified · Split

106 files

CREDITS +5 −6
Documentation/00-INDEX +1 −1
Documentation/ABI/testing/sysfs-block-zram +5 −4
Documentation/DocBook/media/v4l/vidioc-g-parm.xml +2 −2
Documentation/IRQ-affinity.txt +2 −2
Documentation/SubmittingPatches +10 −0
Documentation/acpi/enumeration.txt +1 −1
Documentation/arm/OMAP/omap_pm +1 −1
Documentation/block/cfq-iosched.txt +1 −1
Documentation/cachetlb.txt +3 −3
Documentation/cputopology.txt +1 −1
Documentation/development-process/2.Process +2 −2
Documentation/devicetree/bindings/arm/ste-u300.txt +1 −1
Documentation/devicetree/bindings/arm/vexpress-sysreg.txt +2 −2
Documentation/devicetree/bindings/c6x/dscr.txt +1 −1
Documentation/devicetree/bindings/clock/clk-exynos-audss.txt +1 −1
Documentation/devicetree/bindings/clock/st,nomadik.txt +1 −1
Documentation/devicetree/bindings/dma/atmel-dma.txt +2 −2
Documentation/devicetree/bindings/dma/fsl-imx-dma.txt +1 −1
Documentation/devicetree/bindings/dma/ste-dma40.txt +2 −2
Documentation/devicetree/bindings/mfd/cros-ec.txt +1 −1
Documentation/devicetree/bindings/net/can/atmel-can.txt +1 −1
Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt +1 −1
Documentation/devicetree/bindings/serial/rs485.txt +1 −1
Documentation/dma-buf-sharing.txt +1 −1
Documentation/early-userspace/README +1 −2
Documentation/fb/fbcon.txt +1 −1
Documentation/fb/viafb.modes +1 −1
Documentation/fb/viafb.txt +1 −1
Documentation/filesystems/btrfs.txt +1 −1
Documentation/filesystems/ext4.txt +1 −1
Documentation/filesystems/nfs/Exporting +1 −1
Documentation/filesystems/nfs/pnfs.txt +1 −1
Documentation/filesystems/qnx6.txt +1 −1
Documentation/filesystems/relay.txt +1 −1
Documentation/filesystems/sysfs-tagging.txt +1 −1
Documentation/filesystems/xfs.txt +1 −1
Documentation/fmc/carrier.txt +1 −1
Documentation/hwmon/abituguru-datasheet +1 −1
Documentation/hwmon/submitting-patches +1 −1
Documentation/hwspinlock.txt +1 −1
Documentation/i2c/upgrading-clients +2 −2
Documentation/kmemcheck.txt +3 −3
Documentation/leds/leds-lm3556.txt +1 −1
Documentation/leds/leds-lp3944.txt +1 −1
Documentation/memory-hotplug.txt +1 −1
Documentation/mtd/nand_ecc.txt +1 −1
Documentation/power/basic-pm-debugging.txt +5 −5
Documentation/power/swsusp.txt +14 −1
Documentation/printk-formats.txt +3 −3
Documentation/rapidio/rapidio.txt +1 −1
Documentation/scsi/hptiop.txt +1 −1
Documentation/sound/alsa/README.maya44 +1 −1
Documentation/sound/alsa/compress_offload.txt +2 −2
Documentation/sysfs-rules.txt +1 −1
Documentation/target/tcm_mod_builder.py +1 −1
Documentation/trace/ftrace.txt +2 −2
Documentation/trace/tracepoints.txt +17 −2
Documentation/virtual/kvm/api.txt +1 −1
Documentation/x86/boot.txt +1 −1
Documentation/zh_CN/SubmittingPatches +1 −1
arch/parisc/kernel/signal.c +1 −1
arch/powerpc/mm/init_32.c +1 −1
crypto/api.c +1 −1
drivers/block/drbd/drbd_bitmap.c +1 −1
drivers/clocksource/acpi_pm.c +2 −2
drivers/crypto/ux500/hash/hash_core.c +1 −1
drivers/gpu/drm/radeon/r300.c +1 −1
drivers/infiniband/hw/ehca/ipz_pt_fn.c +2 −1
drivers/media/usb/gspca/vicam.c +1 −1
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +1 −1
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 −1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +1 −1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +1 −1
drivers/net/ethernet/sis/sis900.c +1 −1
drivers/net/wireless/cw1200/wsm.c +1 −1
drivers/net/wireless/iwlwifi/mvm/time-event.c +1 −1
drivers/net/wireless/rtlwifi/rtl8188ee/fw.c +2 −2
drivers/net/wireless/rtlwifi/rtl8192de/dm.c +1 −1
drivers/net/wireless/rtlwifi/rtl8723ae/fw.c +2 −2
drivers/power/88pm860x_charger.c +2 −2
drivers/power/pm2301_charger.c +1 −1
drivers/scsi/bfa/bfad_im.c +1 −1
drivers/scsi/cxgbi/libcxgbi.h +4 −4
drivers/scsi/hpsa.c +1 −1
drivers/scsi/lpfc/lpfc_attr.c +4 −4
drivers/scsi/lpfc/lpfc_bsg.c +1 −1
drivers/scsi/megaraid/megaraid_mbox.c +5 −5
drivers/scsi/megaraid/megaraid_mm.c +1 −1
drivers/scsi/megaraid/megaraid_sas_fusion.h +1 −1
drivers/scsi/qla2xxx/qla_bsg.c +1 −1
drivers/scsi/qla2xxx/qla_mr.c +1 −1
drivers/spi/spi-bitbang.c +1 −1
drivers/tty/serial/kgdboc.c +1 −1
fs/btrfs/send.c +1 −1
fs/ext4/super.c +2 −2
fs/gfs2/dir.c +1 −1
include/linux/coda.h +0 −1
include/linux/ktime.h +15 −13
kernel/workqueue.c +66 −41
mm/memory-failure.c +1 −1
mm/page_alloc.c +1 −1
mm/page_isolation.c +4 −4
net/sched/sch_choke.c +2 −1
sound/pci/ens1370.c +1 −1
sound/pci/via82xx.c +1 −1

CREDITS+5−6

@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096 · 636 unmodified lines
637	S: Bellevue, Washington 98007	637	S: Bellevue, Washington 98007
638	S: USA	638	S: USA
639		639
640	N: Christopher L. Cheney	640	N: Chris Cheney
641	E: ccheney@debian.org	641	E: chris.cheney@gmail.com
642	E: ccheney@cheney.cx	642	E: ccheney@redhat.com
643	W: http://www.cheney.cx
644	P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2	643	P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2
645	D: Vista Imaging usb webcam driver	644	D: Vista Imaging usb webcam driver
646	S: 314 Prince of Wales	645	S: 2308 Therrell Way
647	S: Conroe, TX 77304	646	S: McKinney, TX 75070
648	S: USA	647	S: USA
649		648
650	N: Stuart Cheshire	649	N: Stuart Cheshire

Documentation/00-INDEX+1−1

@@ -40,7 +40,7 @@ IPMI.txt · 39 unmodified lines
40	IRQ-affinity.txt	40	IRQ-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.
42	IRQ-domain.txt	42	IRQ-domain.txt
43	- info on inerrupt numbering and setting up IRQ domains.	43	- info on interrupt numbering and setting up IRQ domains.
44	IRQ.txt	44	IRQ.txt
45	- description of what an IRQ is.	45	- description of what an IRQ is.
46	Intel-IOMMU.txt	46	Intel-IOMMU.txt

Documentation/ABI/testing/sysfs-block-zram+5−4

 		The disksize file is read-write and specifies the disk size
 		which represents the limit on the *uncompressed* worth of data
 		that can be stored in this disk.
+		Unit: bytes
 What:		/sys/block/zram<id>/initstate
 Date:		August 2010
 Contact:	Nitin Gupta <ngupta@vflare.org>
 Description:
-		The disksize file is read-only and shows the initialization
+		The initstate file is read-only and shows the initialization
 		state of the device.
 What:		/sys/block/zram<id>/reset
 Date:		August 2010
 Contact:	Nitin Gupta <ngupta@vflare.org>
 Description:
-		The disksize file is write-only and allows resetting the
+		The reset file is write-only and allows resetting the
-		device. The reset operation frees all the memory assocaited
+		device. The reset operation frees all the memory associated
 		with this device.
 What:		/sys/block/zram<id>/num_reads
 Description:
 		The notify_free file is read-only and specifies the number of
 		swap slot free notifications received by this device. These
-		notifications are send to a swap block device when a swap slot
+		notifications are sent to a swap block device when a swap slot
 		is freed. This statistic is applicable only when this disk is
 		being used as a swap disk.

Documentation/DocBook/media/v4l/vidioc-g-parm.xml+2−2

@@ -132,7 +132,7 @@ devices.</para> · 131 unmodified lines
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
136	successive frames captured by the driver, in seconds. The	136	successive frames captured by the driver, in seconds. The
137	field is intended to skip frames on the driver side, saving I/O	137	field is intended to skip frames on the driver side, saving I/O
138	bandwidth.</para><para>Applications store here the desired frame	138	bandwidth.</para><para>Applications store here the desired frame
@@ -193,7 +193,7 @@ applications must set the array to zero.</entry> · 54 unmodified lines
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
197	successive frames output by the driver, in seconds.</entry>	197	successive frames output by the driver, in seconds.</entry>
198	</row>	198	</row>
199	<row>	199	<row>

Documentation/IRQ-affinity.txt+2−2

@@ -57,8 +57,8 @@ i.e counters for the CPU0-3 did not change. · 56 unmodified lines
57		57
58	Here is an example of limiting that same irq (44) to cpus 1024 to 1031:	58	Here 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
62	1024-1031	62	1024-1031
63		63
64	Note that to do this with a bitmask would require 32 bitmasks of zero	64	Note that to do this with a bitmask would require 32 bitmasks of zero

Documentation/SubmittingPatches+10−0

@@ -109,6 +109,16 @@ probably didn't even receive earlier versions of the patch. · 108 unmodified lines
109	If the patch fixes a logged bug entry, refer to that bug entry by	109	If the patch fixes a logged bug entry, refer to that bug entry by
110	number and URL.	110	number and URL.
111		111
		112	If you want to refer to a specific commit, don't just refer to the
		113	SHA-1 ID of the commit. Please also include the oneline summary of
		114	the commit, to make it easier for reviewers to know what it is about.
		115	Example:
		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
113	3) Separate your changes.	123	3) Separate your changes.
114		124

Documentation/acpi/enumeration.txt+1−1

@@ -207,7 +207,7 @@ passing those. One idea is to return this in _DSM method like: · 206 unmodified lines
207	Return (Local0)	207	Return (Local0)
208	}	208	}
209		209
210	Then the at25 SPI driver can get this configation by calling _DSM on its	210	Then the at25 SPI driver can get this configuration by calling _DSM on its
211	ACPI handle like:	211	ACPI handle like:
212		212
213	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };	213	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };

Documentation/arm/OMAP/omap_pm+1−1

@@ -78,7 +78,7 @@ to NULL. Drivers should use the following idiom: · 77 unmodified lines
78	The most common usage of these functions will probably be to specify	78	The most common usage of these functions will probably be to specify
79	the maximum time from when an interrupt occurs, to when the device	79	the maximum time from when an interrupt occurs, to when the device
80	becomes accessible. To accomplish this, driver writers should use the	80	becomes accessible. To accomplish this, driver writers should use the
81	set_max_mpu_wakeup_lat() function to to constrain the MPU wakeup	81	set_max_mpu_wakeup_lat() function to constrain the MPU wakeup
82	latency, and the set_max_dev_wakeup_lat() function to constrain the	82	latency, and the set_max_dev_wakeup_lat() function to constrain the
83	device wakeup latency (from clk_enable() to accessibility). For	83	device wakeup latency (from clk_enable() to accessibility). For
84	example,	84	example,

Documentation/block/cfq-iosched.txt+1−1

@@ -69,7 +69,7 @@ one, this value should be decreased relative to fifo_expire_async. · 68 unmodified lines
69	group_idle	69	group_idle
70	-----------	70	-----------
71	This parameter forces idling at the CFQ group level instead of CFQ	71	This parameter forces idling at the CFQ group level instead of CFQ
72	queue level. This was introduced after after a bottleneck was observed	72	queue level. This was introduced after a bottleneck was observed
73	in higher end storage due to idle on sequential queue and allow dispatch	73	in higher end storage due to idle on sequential queue and allow dispatch
74	from a single queue. The idea with this parameter is that it can be run with	74	from a single queue. The idea with this parameter is that it can be run with
75	slice_idle=0 and group_idle=8, so that idling does not happen on individual	75	slice_idle=0 and group_idle=8, so that idling does not happen on individual

Documentation/cachetlb.txt+3−3

@@ -57,7 +57,7 @@ changes occur: · 56 unmodified lines
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. · 311 unmodified lines
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
381	The final category of APIs is for I/O to deliberately aliased address	381	The final category of APIs is for I/O to deliberately aliased address
382	ranges inside the kernel. Such aliases are set up by use of the	382	ranges inside the kernel. Such aliases are set up by use of the

Documentation/cputopology.txt+1−1

@@ -22,7 +22,7 @@ to /proc/cpuinfo. · 21 unmodified lines
22		22
23	4) /sys/devices/system/cpu/cpuX/topology/thread_siblings:	23	4) /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
28	5) /sys/devices/system/cpu/cpuX/topology/core_siblings:	28	5) /sys/devices/system/cpu/cpuX/topology/core_siblings:

Documentation/development-process/2.Process+2−2

@@ -276,7 +276,7 @@ mainline get there via -mm. · 275 unmodified lines
276	The current -mm patch is available in the "mmotm" (-mm of the moment)	276	The current -mm patch is available in the "mmotm" (-mm of the moment)
277	directory at:	277	directory at:
278		278
279	http://userweb.kernel.org/~akpm/mmotm/	279	http://www.ozlabs.org/~akpm/mmotm/
280		280
281	Use of the MMOTM tree is likely to be a frustrating experience, though;	281	Use of the MMOTM tree is likely to be a frustrating experience, though;
282	there is a definite chance that it will not even compile.	282	there 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. · 4 unmodified lines
287	Linux-next trees are announced on the linux-kernel and linux-next mailing	287	Linux-next trees are announced on the linux-kernel and linux-next mailing
288	lists when they are assembled; they can be downloaded from:	288	lists 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
292	Some information about linux-next has been gathered at:	292	Some information about linux-next has been gathered at:
293		293

Documentation/devicetree/bindings/arm/ste-u300.txt+1−1

@@ -22,7 +22,7 @@ This contains the board-specific information. · 21 unmodified lines
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
28	Example:	28	Example:

Documentation/devicetree/bindings/arm/vexpress-sysreg.txt+2−2

@@ -32,8 +32,8 @@ numbers - see motherboard's TRM for more details. · 31 unmodified lines
32	The node describing a config device must refer to the sysreg node via	32	The 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
34	parent) and relies on the board topology properties - see main vexpress	34	parent) and relies on the board topology properties - see main vexpress
35	node documentation for more details. It must must also define the	35	node documentation for more details. It must also define the following
36	following property:	36	property:
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.)

Documentation/devicetree/bindings/c6x/dscr.txt+1−1

@@ -5,7 +5,7 @@ TI C6X SoCs contain a region of miscellaneous registers which provide various · 4 unmodified lines
5	function for SoC control or status. Details vary considerably among from SoC	5	function for SoC control or status. Details vary considerably among from SoC
6	to SoC with no two being alike.	6	to SoC with no two being alike.
7		7
8	In general, the Device State Configuraion Registers (DSCR) will provide one or	8	In general, the Device State Configuration Registers (DSCR) will provide one or
9	more configuration registers often protected by a lock register where one or	9	more configuration registers often protected by a lock register where one or
10	more key values must be written to a lock register in order to unlock the	10	more key values must be written to a lock register in order to unlock the
11	configuration register for writes. These configuration register may be used to	11	configuration register for writes. These configuration register may be used to

Documentation/devicetree/bindings/clock/clk-exynos-audss.txt+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2		2
3	The Samsung Audio Subsystem clock controller generates and supplies clocks	3	The Samsung Audio Subsystem clock controller generates and supplies clocks
4	to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock	4	to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock
5	binding described here is applicable to all SoC's in Exynos family.	5	binding described here is applicable to all SoCs in Exynos family.
6		6
7	Required Properties:	7	Required Properties:
8		8

Documentation/devicetree/bindings/clock/st,nomadik.txt+1−1

@@ -17,7 +17,7 @@ Optional properties for the SRC node: · 16 unmodified lines
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
23	PLL nodes: these nodes represent the two PLLs on the system,	23	PLL nodes: these nodes represent the two PLLs on the system,

Documentation/devicetree/bindings/dma/atmel-dma.txt+2−2

@@ -18,14 +18,14 @@ dma0: dma@ffffec00 { · 17 unmodified lines
18		18
19	DMA clients connected to the Atmel DMA controller must use the format	19	DMA clients connected to the Atmel DMA controller must use the format
20	described in the dma.txt file, using a three-cell specifier for each channel:	20	described in the dma.txt file, using a three-cell specifier for each channel:
21	a phandle plus two interger cells.	21	a phandle plus two integer cells.
22	The three cells in order are:	22	The three cells in order are:
23		23
24	1. A phandle pointing to the DMA controller.	24	1. A phandle pointing to the DMA controller.
25	2. The memory interface (16 most significant bits), the peripheral interface	25	2. The memory interface (16 most significant bits), the peripheral interface
26	(16 less significant bits).	26	(16 less significant bits).
27	3. Parameters for the at91 DMA configuration register which are device	27	3. Parameters for the at91 DMA configuration register which are device
28	dependant:	28	dependent:
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.

Documentation/devicetree/bindings/dma/fsl-imx-dma.txt+1−1

@@ -34,7 +34,7 @@ Clients have to specify the DMA requests with phandles in a list. · 33 unmodified lines
34	Required properties:	34	Required 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

Documentation/devicetree/bindings/dma/ste-dma40.txt+2−2

@@ -37,14 +37,14 @@ Each dmas request consists of 4 cells: · 36 unmodified lines
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:

Documentation/devicetree/bindings/mfd/cros-ec.txt+1−1

@@ -4,7 +4,7 @@ Google's ChromeOS EC is a Cortex-M device which talks to the AP and · 3 unmodified lines
4	implements various function such as keyboard and battery charging.	4	implements various function such as keyboard and battery charging.
5		5
6	The EC can be connect through various means (I2C, SPI, LPC) and the	6	The EC can be connect through various means (I2C, SPI, LPC) and the
7	compatible string used depends on the inteface. Each connection method has	7	compatible string used depends on the interface. Each connection method has
8	its own driver which connects to the top level interface-agnostic EC driver.	8	its own driver which connects to the top level interface-agnostic EC driver.
9	Other Linux driver (such as cros-ec-keyb for the matrix keyboard) connect to	9	Other Linux driver (such as cros-ec-keyb for the matrix keyboard) connect to
10	the top-level driver.	10	the top-level driver.

Documentation/devicetree/bindings/net/can/atmel-can.txt+1−1

@@ -8,7 +8,7 @@ Required properties: · 7 unmodified lines
8	Example:	8	Example:
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	};

Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt+1−1

@@ -37,7 +37,7 @@ Bank: 3 (A, B and C) · 36 unmodified lines
37	0xffffffff 0x7fff3ccf /* pioB */	37	0xffffffff 0x7fff3ccf /* pioB */
38	0xffffffff 0x007fffff /* pioC */	38	0xffffffff 0x007fffff /* pioC */
39		39
40	For each peripheral/bank we will descibe in a u32 if a pin can can be	40	For each peripheral/bank we will descibe in a u32 if a pin can be
41	configured in it by putting 1 to the pin bit (1 << pin)	41	configured in it by putting 1 to the pin bit (1 << pin)
42		42
43	Let's take the pioA on peripheral B	43	Let's take the pioA on peripheral B

Documentation/devicetree/bindings/serial/rs485.txt+1−1

@@ -7,7 +7,7 @@ UART node. · 6 unmodified lines
7		7
8	Required properties:	8	Required 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.

Documentation/dma-buf-sharing.txt+1−1

@@ -321,7 +321,7 @@ Access to a dma_buf from the kernel context involves three steps: · 320 unmodified lines
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:

Documentation/early-userspace/README+1−2

@@ -83,8 +83,7 @@ Where's this all leading? · 82 unmodified lines
83		83
84	The klibc distribution contains some of the necessary software to make	84	The klibc distribution contains some of the necessary software to make
85	early userspace useful. The klibc distribution is currently	85	early userspace useful. The klibc distribution is currently
86	maintained separately from the kernel, but this may change early in	86	maintained separately from the kernel.
87	the 2.7 era (it missed the boat for 2.5).
88		87
89	You can obtain somewhat infrequent snapshots of klibc from	88	You can obtain somewhat infrequent snapshots of klibc from
90	ftp://ftp.kernel.org/pub/linux/libs/klibc/	89	ftp://ftp.kernel.org/pub/linux/libs/klibc/

Documentation/fb/fbcon.txt+1−1

@@ -150,7 +150,7 @@ C. Boot options · 149 unmodified lines
150		150
151	C. Attaching, Detaching and Unloading	151	C. Attaching, Detaching and Unloading
152		152
153	Before going on on how to attach, detach and unload the framebuffer console, an	153	Before going on how to attach, detach and unload the framebuffer console, an
154	illustration of the dependencies may help.	154	illustration of the dependencies may help.
155		155
156	The console layer, as with most subsystems, needs a driver that interfaces with	156	The console layer, as with most subsystems, needs a driver that interfaces with

Documentation/fb/viafb.modes+1−1

@@ -571,7 +571,7 @@ mode "640x480-60" · 570 unmodified lines
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

Documentation/fb/viafb.txt+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
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

Documentation/filesystems/btrfs.txt+1−1

@@ -87,7 +87,7 @@ Unless otherwise specified, all options default to off. · 86 unmodified lines
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

Documentation/filesystems/ext4.txt+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	Ext4 Filesystem	2	Ext4 Filesystem
3	===============	3	===============
4		4
5	Ext4 is an an advanced level of the ext3 filesystem which incorporates	5	Ext4 is an advanced level of the ext3 filesystem which incorporates
6	scalability and reliability enhancements for supporting large filesystems	6	scalability 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
8	feature requirements.	8	feature requirements.

Documentation/filesystems/nfs/Exporting+1−1

@@ -93,7 +93,7 @@ For a filesystem to be exportable it must: · 92 unmodified lines
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

Documentation/filesystems/nfs/pnfs.txt+1−1

@@ -12,7 +12,7 @@ struct pnfs_layout_hdr · 11 unmodified lines
12	----------------------	12	----------------------
13	The on-the-wire command LAYOUTGET corresponds to struct	13	The on-the-wire command LAYOUTGET corresponds to struct
14	pnfs_layout_segment, usually referred to by the variable name lseg.	14	pnfs_layout_segment, usually referred to by the variable name lseg.
15	Each nfs_inode may hold a pointer to a cache of of these layout	15	Each nfs_inode may hold a pointer to a cache of these layout
16	segments in nfsi->layout, of type struct pnfs_layout_hdr.	16	segments in nfsi->layout, of type struct pnfs_layout_hdr.
17		17
18	We reference the header for the inode pointing to it, across each	18	We reference the header for the inode pointing to it, across each

Documentation/filesystems/qnx6.txt+1−1

@@ -149,7 +149,7 @@ Bitmap system area · 148 unmodified lines
149	------------------	149	------------------
150		150
151	The bitmap itself is divided into three parts.	151	The bitmap itself is divided into three parts.
152	First the system area, that is split into two halfs.	152	First the system area, that is split into two halves.
153	Then userspace.	153	Then userspace.
154		154
155	The requirement for a static, fixed preallocated system area comes from how	155	The requirement for a static, fixed preallocated system area comes from how

Documentation/filesystems/relay.txt+1−1

@@ -31,7 +31,7 @@ Semantics · 30 unmodified lines
31		31
32	Each relay channel has one buffer per CPU, each buffer has one or more	32	Each relay channel has one buffer per CPU, each buffer has one or more
33	sub-buffers. Messages are written to the first sub-buffer until it is	33	sub-buffers. Messages are written to the first sub-buffer until it is
34	too full to contain a new message, in which case it it is written to	34	too full to contain a new message, in which case it is written to
35	the next (if available). Messages are never split across sub-buffers.	35	the next (if available). Messages are never split across sub-buffers.
36	At this point, userspace can be notified so it empties the first	36	At this point, userspace can be notified so it empties the first
37	sub-buffer, while the kernel continues writing to the next.	37	sub-buffer, while the kernel continues writing to the next.

Documentation/filesystems/sysfs-tagging.txt+1−1

@@ -24,7 +24,7 @@ flag between KOBJ_NS_TYPE_NONE and KOBJ_NS_TYPES, and s_ns will · 23 unmodified lines
24	point to the namespace to which it belongs.	24	point to the namespace to which it belongs.
25		25
26	Each sysfs superblock's sysfs_super_info contains an array void	26	Each 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
28	kobj_nstype first mounts sysfs, a new superblock is created. It	28	kobj_nstype first mounts sysfs, a new superblock is created. It
29	will be differentiated from other sysfs mounts by having its	29	will be differentiated from other sysfs mounts by having its
30	s_fs_info->ns[kobj_nstype] set to the new namespace. Note that	30	s_fs_info->ns[kobj_nstype] set to the new namespace. Note that

Documentation/filesystems/xfs.txt+1−1

@@ -135,7 +135,7 @@ default behaviour. · 134 unmodified lines
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

Documentation/fmc/carrier.txt+1−1

@@ -213,7 +213,7 @@ The individual methods perform the following tasks: · 212 unmodified lines
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

Documentation/hwmon/abituguru-datasheet+1−1

@@ -299,7 +299,7 @@ Byte 1: · 298 unmodified lines
299	min threshold (scale as bank 0x26)	299	min threshold (scale as bank 0x26)
300		300
301		301
302	Warning for the adventerous	302	Warning for the adventurous
303	===========================	303	===========================
304		304
305	A word of caution to those who want to experiment and see if they can figure	305	A word of caution to those who want to experiment and see if they can figure

Documentation/hwmon/submitting-patches+1−1

@@ -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
4	This text is is a collection of suggestions for people writing patches or	4	This text is a collection of suggestions for people writing patches or
5	drivers for the hwmon subsystem. Following these suggestions will greatly	5	drivers for the hwmon subsystem. Following these suggestions will greatly
6	increase the chances of your change being accepted.	6	increase the chances of your change being accepted.
7		7

Documentation/hwspinlock.txt+1−1

@@ -241,7 +241,7 @@ int hwspinlock_example2(void) · 240 unmodified lines
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
246	5. Important structs	246	5. Important structs
247		247

Documentation/i2c/upgrading-clients+2−2

@@ -196,8 +196,8 @@ static int example_probe(struct i2c_client *i2c_client, · 195 unmodified lines
196		196
197	Update the detach method, by changing the name to _remove and	197	Update the detach method, by changing the name to _remove and
198	to delete the i2c_detach_client call. It is possible that you	198	to delete the i2c_detach_client call. It is possible that you
199	can also remove the ret variable as it is not not needed for	199	can also remove the ret variable as it is not needed for any
200	any of the core functions.	200	of 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)

Documentation/kmemcheck.txt+3−3

@@ -91,9 +91,9 @@ information from the kmemcheck warnings, which is extremely valuable in · 90 unmodified lines
91	debugging a problem. This option is not mandatory, however, because it slows	91	debugging a problem. This option is not mandatory, however, because it slows
92	down the compilation process and produces a much bigger kernel image.	92	down the compilation process and produces a much bigger kernel image.
93		93
94	Now the kmemcheck menu should be visible (under "Kernel hacking" / "kmemcheck:	94	Now the kmemcheck menu should be visible (under "Kernel hacking" / "Memory
95	trap use of uninitialized memory"). Here follows a description of the	95	Debugging" / "kmemcheck: trap use of uninitialized memory"). Here follows
96	kmemcheck configuration variables:	96	a description of the kmemcheck configuration variables:
97		97
98	o CONFIG_KMEMCHECK	98	o CONFIG_KMEMCHECK
99		99

Documentation/leds/leds-lm3556.txt+1−1

@@ -71,7 +71,7 @@ To register the chip at address 0x63 on specific adapter, set the platform data · 70 unmodified lines
71	according to include/linux/platform_data/leds-lm3556.h, set the i2c board info	71	according to include/linux/platform_data/leds-lm3556.h, set the i2c board info
72		72
73	Example:	73	Example:
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,

Documentation/leds/leds-lp3944.txt+1−1

@@ -37,7 +37,7 @@ registered using the i2c_board_info mechanism. · 36 unmodified lines
37	To register the chip at address 0x60 on adapter 0, set the platform data	37	To register the chip at address 0x60 on adapter 0, set the platform data
38	according to include/linux/leds-lp3944.h, set the i2c board info:	38	according 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,

Documentation/memory-hotplug.txt+1−1

@@ -163,7 +163,7 @@ a recent addition and not present on older kernels. · 162 unmodified lines
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

Documentation/mtd/nand_ecc.txt+1−1

@@ -543,7 +543,7 @@ THe code within the for loop was changed to: · 542 unmodified lines
543	}	543	}
544		544
545	As you can see tmppar is used to accumulate the parity within a for	545	As you can see tmppar is used to accumulate the parity within a for
546	iteration. In the last 3 statements is is added to par and, if needed,	546	iteration. In the last 3 statements is added to par and, if needed,
547	to rp12 and rp14.	547	to rp12 and rp14.
548		548
549	While making the changes I also found that I could exploit that tmppar	549	While making the changes I also found that I could exploit that tmppar

Documentation/power/basic-pm-debugging.txt+5−5

Documentation/power/swsusp.txt+14−1

 before suspend (it is limited to 500 MB by default).
+. The resume process checks for the presence of the resume device,
+if found, it then checks the contents for the hibernation image signature.
+If both are found, it resumes the hibernation image.
+. The resume process may be triggered in two ways:
+  1) During lateinit:  If resume=/dev/your_swap_partition is specified on
+     the kernel command line, lateinit runs the resume process.  If the
+     resume device has not been probed yet, the resume process fails and
+     bootup continues.
+  2) Manually from an initrd or initramfs:  May be run from
+     the init script by using the /sys/power/resume file.  It is vital
+     that this be done prior to remounting any filesystems (even as
+     read-only) otherwise data may be corrupted.
 Article about goals and implementation of Software Suspend for Linux
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 disk drivers (especially SATA)?
 A: Well, it can be done, load the drivers, then do echo into
-/sys/power/disk/resume file from initrd. Be sure not to mount
+/sys/power/resume file from initrd. Be sure not to mount
 anything, not even read-only mount, or you are going to lose your
 data.

Documentation/printk-formats.txt+3−3

@@ -97,7 +97,7 @@ IPv4 addresses: · 96 unmodified lines
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: · 90 unmodified lines
194		194
195	u64 SHOULD be printed with %llu/%llx, (unsigned long long):	195	u64 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
199	s64 SHOULD be printed with %lld/%llx, (long long):	199	s64 SHOULD be printed with %lld/%llx, (long long):
200		200
201	printk("%lld", (long long)s64_var);	201	printk("%lld", s64_var);
202		202
203	If <type> is dependent on a config option for its size (e.g., sector_t,	203	If <type> is dependent on a config option for its size (e.g., sector_t,
204	blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a	204	blkcnt_t) or is architecture-dependent for its size (e.g., tcflag_t), use a

Documentation/rapidio/rapidio.txt+1−1

@@ -300,7 +300,7 @@ initialization. · 299 unmodified lines
300	-------------------------------------------	300	-------------------------------------------
301		301
302	RapidIO subsystem code organization allows addition of new enumeration/discovery	302	RapidIO subsystem code organization allows addition of new enumeration/discovery
303	methods as new configuration options without significant impact to to the core	303	methods as new configuration options without significant impact to the core
304	RapidIO code.	304	RapidIO code.
305		305
306	A new enumeration/discovery method has to be attached to one or more mport	306	A new enumeration/discovery method has to be attached to one or more mport

Documentation/scsi/hptiop.txt+1−1

@@ -151,7 +151,7 @@ To send a request to the controller: · 150 unmodified lines
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

Documentation/sound/alsa/README.maya44+1−1

@@ -120,7 +120,7 @@ Mic Phantom+48V: switch for +48V phantom power for electrostatic microphones on · 119 unmodified lines
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
123	Mic/Line input: if switch is is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo).	123	Mic/Line input: if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo).
124		124
125	Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver.	125	Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver.
126	Bypass 1: same for channel 3+4.	126	Bypass 1: same for channel 3+4.

Documentation/sound/alsa/compress_offload.txt+2−2

@@ -73,7 +73,7 @@ The main requirements are: · 72 unmodified lines
73		73
74	Design	74	Design
75		75
76	The new API shares a number of concepts with with the PCM API for flow	76	The new API shares a number of concepts with the PCM API for flow
77	control. Start, pause, resume, drain and stop commands have the same	77	control. Start, pause, resume, drain and stop commands have the same
78	semantics no matter what the content is.	78	semantics no matter what the content is.
79		79
@@ -130,7 +130,7 @@ the settings should remain the exception. · 50 unmodified lines
130	The timestamp becomes a multiple field structure. It lists the number	130	The timestamp becomes a multiple field structure. It lists the number
131	of bytes transferred, the number of samples processed and the number	131	of bytes transferred, the number of samples processed and the number
132	of samples rendered/grabbed. All these values can be used to determine	132	of samples rendered/grabbed. All these values can be used to determine
133	the avarage bitrate, figure out if the ring buffer needs to be	133	the average bitrate, figure out if the ring buffer needs to be
134	refilled or the delay due to decoding/encoding/io on the DSP.	134	refilled or the delay due to decoding/encoding/io on the DSP.
135		135
136	Note that the list of codecs/profiles/modes was derived from the	136	Note that the list of codecs/profiles/modes was derived from the

Documentation/sysfs-rules.txt+1−1

@@ -47,7 +47,7 @@ versions of the sysfs interface. · 46 unmodified lines
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.

Documentation/target/tcm_mod_builder.py+1−1

@@ -300,7 +300,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): · 299 unmodified lines
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"

Documentation/trace/ftrace.txt+2−2

@@ -735,7 +735,7 @@ Here are the available options: · 734 unmodified lines
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: · 17 unmodified lines
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

Documentation/trace/tracepoints.txt+17−2

 In order to use tracepoints, you should include linux/tracepoint.h.
-In include/trace/subsys.h :
+In include/trace/events/subsys.h :
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM subsys
+#if !defined(_TRACE_SUBSYS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SUBSYS_H
 #include <linux/tracepoint.h>
 	TP_PROTO(int firstarg, struct task_struct *p),
 	TP_ARGS(firstarg, p));
+#endif /* _TRACE_SUBSYS_H */
+/* This part must be outside protection */
+#include <trace/define_trace.h>
 In subsys/file.c (where the tracing statement must be added) :
-#include <trace/subsys.h>
+#include <trace/events/subsys.h>
+#define CREATE_TRACE_POINTS
 DEFINE_TRACE(subsys_eventname);
 void somefct(void)
 - TP_ARGS(firstarg, p) are the parameters names, same as found in the
   prototype.
+- if you use the header in multiple source files, #define CREATE_TRACE_POINTS
+  should appear only in one source file.
 Connecting a function (probe) to a tracepoint is done by providing a
 probe (function to call) for the specific tracepoint through
 register_trace_subsys_eventname().  Removing a probe is done through

Documentation/virtual/kvm/api.txt+1−1

@@ -53,7 +53,7 @@ incompatible change are allowed. However, there is an extension · 52 unmodified lines
53	facility that allows backward-compatible extensions to the API to be	53	facility that allows backward-compatible extensions to the API to be
54	queried and used.	54	queried and used.
55		55
56	The extension mechanism is not based on on the Linux version number.	56	The extension mechanism is not based on the Linux version number.
57	Instead, kvm defines extension identifiers and a facility to query	57	Instead, kvm defines extension identifiers and a facility to query
58	whether a particular extension identifier is available. If it is, a	58	whether a particular extension identifier is available. If it is, a
59	set of ioctls is available for application use.	59	set of ioctls is available for application use.

Documentation/x86/boot.txt+1−1

@@ -58,7 +58,7 @@ Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover · 57 unmodified lines
58	protocol entry point.	58	protocol entry point.
59		59
60	Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields	60	Protocol 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

Documentation/zh_CN/SubmittingPatches+1−1

@@ -146,7 +146,7 @@ Majordomo lists of VGER.KERNEL.ORG at: · 145 unmodified lines
146	<http://vger.kernel.org/vger-lists.html>	146	<http://vger.kernel.org/vger-lists.html>
147		147
148	如果改动影响了用户空间和内核之间的接口，请给 MAN-PAGES 的维护者（列在	148	如果改动影响了用户空间和内核之间的接口，请给 MAN-PAGES 的维护者（列在
149	MAITAINERS 文件里的）发送一个手册页（man-pages）补丁，或者至少通知一下改	149	MAINTAINERS 文件里的）发送一个手册页（man-pages）补丁，或者至少通知一下改
150	变，让一些信息有途径进入手册页。	150	变，让一些信息有途径进入手册页。
151		151
152	即使在第四步的时候，维护者没有作出回应，也要确认在修改他们的代码的时候	152	即使在第四步的时候，维护者没有作出回应，也要确认在修改他们的代码的时候

arch/parisc/kernel/signal.c+1−1

@@ -78,7 +78,7 @@ restore_sigcontext(struct sigcontext __user sc, struct pt_regs regs) · 77 unmodified lines
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;

arch/powerpc/mm/init_32.c+1−1

@@ -52,7 +52,7 @@ · 51 unmodified lines
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

crypto/api.c+1−1

@@ -391,7 +391,7 @@ EXPORT_SYMBOL_GPL(__crypto_alloc_tfm); · 390 unmodified lines
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

drivers/block/drbd/drbd_bitmap.c+1−1

@@ -393,7 +393,7 @@ static struct page *bm_realloc_pages(struct drbd_bitmap b, unsigned long want) · 392 unmodified lines
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,

drivers/clocksource/acpi_pm.c+2−2

@@ -200,14 +200,14 @@ static int __init init_acpi_pm_clocksource(void) · 199 unmodified lines
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	}

drivers/crypto/ux500/hash/hash_core.c+1−1

@@ -282,7 +282,7 @@ static int get_empty_message_digest( · 281 unmodified lines
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	}

drivers/gpu/drm/radeon/r300.c+1−1

@@ -1541,7 +1541,7 @@ int r300_init(struct radeon_device *rdev) · 1540 unmodified lines
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);

drivers/infiniband/hw/ehca/ipz_pt_fn.c+2−1

@@ -222,7 +222,8 @@ int ipz_queue_ctor(struct ehca_pd pd, struct ipz_queue queue, · 221 unmodified lines
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) {

drivers/media/usb/gspca/vicam.c+1−1

@@ -6,7 +6,7 @@ · 5 unmodified lines
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)

drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c+1−1

@@ -1157,7 +1157,7 @@ static void cxgb_redirect(struct dst_entry old, struct dst_entry new, · 1156 unmodified lines
1157	*/	1157	*/
1158	void *cxgb_alloc_mem(unsigned long size)	1158	void *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);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c+1−1

@@ -1142,7 +1142,7 @@ out: release_firmware(fw); · 1141 unmodified lines
1142	*/	1142	*/
1143	void *t4_alloc_mem(size_t size)	1143	void *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);

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c+1−1

@@ -3148,7 +3148,7 @@ int qlcnic_83xx_set_settings(struct qlcnic_adapter *adapter, · 3147 unmodified lines
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;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c+1−1

@@ -1781,7 +1781,7 @@ static int qlcnic_83xx_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, · 1780 unmodified lines
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

drivers/net/ethernet/sis/sis900.c+1−1

@@ -1709,7 +1709,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance) · 1708 unmodified lines
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);

drivers/net/wireless/cw1200/wsm.c+1−1

@@ -1199,7 +1199,7 @@ bool wsm_flush_tx(struct cw1200_common *priv) · 1198 unmodified lines
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 */

drivers/net/wireless/iwlwifi/mvm/time-event.c+1−1

@@ -199,7 +199,7 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm, · 198 unmodified lines
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;

drivers/net/wireless/rtlwifi/rtl8188ee/fw.c+2−2

@@ -341,7 +341,7 @@ static void _rtl88e_fill_h2c_command(struct ieee80211_hw *hw, · 340 unmodified lines
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, · 3 unmodified lines
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

drivers/net/wireless/rtlwifi/rtl8192de/dm.c+1−1

@@ -416,7 +416,7 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw) · 415 unmodified lines
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; */

drivers/net/wireless/rtlwifi/rtl8723ae/fw.c+2−2

@@ -330,7 +330,7 @@ static void _rtl8723ae_fill_h2c_command(struct ieee80211_hw *hw, · 329 unmodified lines
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, · 3 unmodified lines
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

drivers/power/88pm860x_charger.c+2−2

@@ -554,7 +554,7 @@ static irqreturn_t pm860x_vchg_handler(int irq, void *data) · 553 unmodified lines
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) · 1 unmodified line
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,

drivers/power/pm2301_charger.c+1−1

@@ -386,7 +386,7 @@ static int pm2_int_reg2(void *pm2_data, int val) · 385 unmodified lines
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;

drivers/scsi/bfa/bfad_im.c+1−1

@@ -206,7 +206,7 @@ bfad_im_abort_handler(struct scsi_cmnd *cmnd) · 205 unmodified lines
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	}

drivers/scsi/cxgbi/libcxgbi.h+4−4

@@ -658,11 +658,11 @@ static inline u32 cxgbi_tag_nonrsvd_bits(struct cxgbi_tag_format *tformat, · 657 unmodified lines
658	static inline void *cxgbi_alloc_big_mem(unsigned int size,	658	static 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

drivers/scsi/hpsa.c+1−1

@@ -1054,7 +1054,7 @@ free_and_out: · 1053 unmodified lines
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	*/
1060	static struct hpsa_scsi_dev_t lookup_hpsa_scsi_dev(struct ctlr_info h,	1060	static struct hpsa_scsi_dev_t lookup_hpsa_scsi_dev(struct ctlr_info h,

drivers/scsi/lpfc/lpfc_attr.c+4−4

@@ -816,7 +816,7 @@ lpfc_issue_reset(struct device dev, struct device_attribute attr, · 815 unmodified lines
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) · 10 unmodified lines
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) · 85 unmodified lines
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 */

drivers/scsi/lpfc/lpfc_bsg.c+1−1

@@ -2628,7 +2628,7 @@ err_get_xri_exit: · 2627 unmodified lines
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	**/
2633	static struct lpfc_dmabuf *	2633	static struct lpfc_dmabuf *
2634	lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba)	2634	lpfc_bsg_dma_page_alloc(struct lpfc_hba *phba)

drivers/scsi/megaraid/megaraid_mbox.c+5−5

drivers/scsi/megaraid/megaraid_mm.c+1−1

@@ -896,7 +896,7 @@ hinfo_to_cinfo(mraid_hba_info_t hinfo, mcontroller_t cinfo) · 895 unmodified lines
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	*/
901	int	901	int
902	mraid_mm_register_adp(mraid_mmadp_t *lld_adp)	902	mraid_mm_register_adp(mraid_mmadp_t *lld_adp)

drivers/scsi/megaraid/megaraid_sas_fusion.h+1−1

@@ -88,7 +88,7 @@ enum MR_RAID_FLAGS_IO_SUB_TYPE { · 87 unmodified lines
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

drivers/scsi/qla2xxx/qla_bsg.c+1−1

@@ -1895,7 +1895,7 @@ done: · 1894 unmodified lines
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

drivers/scsi/qla2xxx/qla_mr.c+1−1

@@ -1865,7 +1865,7 @@ qlafx00_fx_disc(scsi_qla_host_t vha, fc_port_t fcport, uint16_t fx_type) · 1864 unmodified lines
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;

drivers/spi/spi-bitbang.c+1−1

@@ -40,7 +40,7 @@ · 39 unmodified lines
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	*

drivers/tty/serial/kgdboc.c+1−1

@@ -45,7 +45,7 @@ static int kgdboc_reset_connect(struct input_handler *handler, · 44 unmodified lines
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

fs/btrfs/send.c+1−1

@@ -219,7 +219,7 @@ static int fs_path_ensure_buf(struct fs_path *p, int len) · 218 unmodified lines
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)

fs/ext4/super.c+2−2

@@ -162,7 +162,7 @@ void *ext4_kvmalloc(size_t size, gfp_t flags) · 161 unmodified lines
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) · 3 unmodified lines
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;

fs/gfs2/dir.c+1−1

@@ -1859,7 +1859,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, · 1858 unmodified lines
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)

include/linux/coda.h+0−1

@@ -60,7 +60,6 @@ Mellon the rights to redistribute these changes without encumbrance. · 59 unmodified lines
60		60
61	#if defined(__linux__)	61	#if defined(__linux__)
62	typedef unsigned long long u_quad_t;	62	typedef 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

include/linux/ktime.h+15−13

  * @secs:	seconds to set
  * @nsecs:	nanoseconds to set
  *
- * Return the ktime_t representation of the value
+ * Return: The ktime_t representation of the value.
  */
 static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
 {
  * @lhs:	minuend
  * @rhs:	subtrahend
  *
- * Returns the remainder of the subtraction
+ * Return: The remainder of the subtraction.
  */
 static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
 {
  * @add1:	addend1
  * @add2:	addend2
  *
- * Returns the sum of @add1 and @add2.
+ * Return: The sum of @add1 and @add2.
  */
 static inline ktime_t ktime_add(const ktime_t add1, const ktime_t add2)
 {
  * @kt:		addend
  * @nsec:	the scalar nsec value to add
  *
- * Returns the sum of @kt and @nsec in ktime_t format
+ * Return: The sum of @kt and @nsec in ktime_t format.
  */
 extern ktime_t ktime_add_ns(const ktime_t kt, u64 nsec);
  * @kt:		minuend
  * @nsec:	the scalar nsec value to subtract
  *
- * Returns the subtraction of @nsec from @kt in ktime_t format
+ * Return: The subtraction of @nsec from @kt in ktime_t format.
  */
 extern ktime_t ktime_sub_ns(const ktime_t kt, u64 nsec);
  * timespec_to_ktime - convert a timespec to ktime_t format
  * @ts:		the timespec variable to convert
  *
- * Returns a ktime_t variable with the converted timespec value
+ * Return: A ktime_t variable with the converted timespec value.
  */
 static inline ktime_t timespec_to_ktime(const struct timespec ts)
 {
  * timeval_to_ktime - convert a timeval to ktime_t format
  * @tv:		the timeval variable to convert
  *
- * Returns a ktime_t variable with the converted timeval value
+ * Return: A ktime_t variable with the converted timeval value.
  */
 static inline ktime_t timeval_to_ktime(const struct timeval tv)
 {
  * ktime_to_timespec - convert a ktime_t variable to timespec format
  * @kt:		the ktime_t variable to convert
  *
- * Returns the timespec representation of the ktime value
+ * Return: The timespec representation of the ktime value.
  */
 static inline struct timespec ktime_to_timespec(const ktime_t kt)
 {
  * ktime_to_timeval - convert a ktime_t variable to timeval format
  * @kt:		the ktime_t variable to convert
  *
- * Returns the timeval representation of the ktime value
+ * Return: The timeval representation of the ktime value.
  */
 static inline struct timeval ktime_to_timeval(const ktime_t kt)
 {
  * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds
  * @kt:		the ktime_t variable to convert
  *
- * Returns the scalar nanoseconds representation of @kt
+ * Return: The scalar nanoseconds representation of @kt.
  */
 static inline s64 ktime_to_ns(const ktime_t kt)
 {
  * @cmp1:	comparable1
  * @cmp2:	comparable2
  *
- * Compare two ktime_t variables, returns 1 if equal
+ * Compare two ktime_t variables.
+ *
+ * Return: 1 if equal.
  */
 static inline int ktime_equal(const ktime_t cmp1, const ktime_t cmp2)
 {
  * @cmp1:	comparable1
  * @cmp2:	comparable2
  *
- * Returns ...
+ * Return: ...
  *   cmp1  < cmp2: return <0
  *   cmp1 == cmp2: return 0
  *   cmp1  > cmp2: return >0
  * @kt:		the ktime_t variable to convert
  * @ts:		the timespec variable to store the result in
  *
- * Returns true if there was a successful conversion, false if kt was 0.
+ * Return: %true if there was a successful conversion, %false if kt was 0.
  */
 static inline __must_check bool ktime_to_timespec_cond(const ktime_t kt,
 						       struct timespec *ts)

kernel/workqueue.c+66−41

  * This must be called either with pwq_lock held or sched RCU read locked.
  * If the pwq needs to be used beyond the locking in effect, the caller is
  * responsible for guaranteeing that the pwq stays online.
+ *
+ * Return: The unbound pool_workqueue for @node.
  */
 static struct pool_workqueue *unbound_pwq_by_node(struct workqueue_struct *wq,
 						  int node)
  * get_work_pool - return the worker_pool a given work was associated with
  * @work: the work item of interest
  *
- * Return the worker_pool @work was last associated with.  %NULL if none.
- *
  * Pools are created and destroyed under wq_pool_mutex, and allows read
  * access under sched-RCU read lock.  As such, this function should be
  * called under wq_pool_mutex or with preemption disabled.
  * mentioned locking is in effect.  If the returned pool needs to be used
  * beyond the critical section, the caller is responsible for ensuring the
  * returned pool is and stays online.
+ *
+ * Return: The worker_pool @work was last associated with.  %NULL if none.
  */
 static struct worker_pool *get_work_pool(struct work_struct *work)
 {
  * get_work_pool_id - return the worker pool ID a given work is associated with
  * @work: the work item of interest
  *
- * Return the worker_pool ID @work was last associated with.
+ * Return: The worker_pool ID @work was last associated with.
  * %WORK_OFFQ_POOL_NONE if none.
  */
 static int get_work_pool_id(struct work_struct *work)
  * CONTEXT:
  * spin_lock_irq(rq->lock)
  *
- * RETURNS:
+ * Return:
  * Worker task on @cpu to wake up, %NULL if none.
  */
 struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu)
  * CONTEXT:
  * spin_lock_irq(pool->lock).
  *
- * RETURNS:
+ * Return:
- * Pointer to worker which is executing @work if found, NULL
+ * Pointer to worker which is executing @work if found, %NULL
  * otherwise.
  */
 static struct worker *find_worker_executing_work(struct worker_pool *pool,
  * @flags: place to store irq state
  *
  * Try to grab PENDING bit of @work.  This function can handle @work in any
- * stable state - idle, on timer or on worklist.  Return values are
+ * stable state - idle, on timer or on worklist.
  *
+ * Return:
  *  1		if @work was pending and we successfully stole PENDING
  *  0		if @work was idle and we claimed PENDING
  *  -EAGAIN	if PENDING couldn't be grabbed at the moment, safe to busy-retry
  *  -ENOENT	if someone else is canceling @work, this state may persist
  *		for arbitrarily long
  *
+ * Note:
  * On >= 0 return, the caller owns @work's PENDING bit.  To avoid getting
  * interrupted while holding PENDING and @work off queue, irq must be
  * disabled on entry.  This, combined with delayed_work->timer being
  * @wq: workqueue to use
  * @work: work to queue
  *
- * Returns %false if @work was already on a queue, %true otherwise.
- *
  * We queue the work to a specific CPU, the caller must ensure it
  * can't go away.
+ *
+ * Return: %false if @work was already on a queue, %true otherwise.
  */
 bool queue_work_on(int cpu, struct workqueue_struct *wq,
 		   struct work_struct *work)
  * @dwork: work to queue
  * @delay: number of jiffies to wait before queueing
  *
- * Returns %false if @work was already on a queue, %true otherwise.  If
+ * Return: %false if @work was already on a queue, %true otherwise.  If
  * @delay is zero and @dwork is idle, it will be scheduled for immediate
  * execution.
  */
  * zero, @work is guaranteed to be scheduled immediately regardless of its
  * current state.
  *
- * Returns %false if @dwork was idle and queued, %true if @dwork was
+ * Return: %false if @dwork was idle and queued, %true if @dwork was
  * pending and its timer was modified.
  *
  * This function is safe to call from any context including IRQ handler.
  * Might sleep.  Called without any lock but returns with pool->lock
  * held.
  *
- * RETURNS:
+ * Return:
  * %true if the associated pool is online (@worker is successfully
  * bound), %false if offline.
  */
  * CONTEXT:
  * Might sleep.  Does GFP_KERNEL allocations.
  *
- * RETURNS:
+ * Return:
  * Pointer to the newly created worker.
  */
 static struct worker *create_worker(struct worker_pool *pool)
  * @pool: the target pool
  *
  * Grab the managership of @pool and create and start a new worker for it.
+ *
+ * Return: 0 on success. A negative error code otherwise.
  */
 static int create_and_start_worker(struct worker_pool *pool)
 {
  * multiple times.  Does GFP_KERNEL allocations.  Called only from
  * manager.
  *
- * RETURNS:
+ * Return:
  * %false if no action was taken and pool->lock stayed locked, %true
  * otherwise.
  */
  * spin_lock_irq(pool->lock) which may be released and regrabbed
  * multiple times.  Called only from manager.
  *
- * RETURNS:
+ * Return:
  * %false if no action was taken and pool->lock stayed locked, %true
  * otherwise.
  */
  * spin_lock_irq(pool->lock) which may be released and regrabbed
  * multiple times.  Does GFP_KERNEL allocations.
  *
- * RETURNS:
+ * Return:
  * %false if the pool don't need management and the caller can safely start
  * processing works, %true indicates that the function released pool->lock
  * and reacquired it to perform some management function and that the
  * work items regardless of their specific target workqueue.  The only
  * exception is work items which belong to workqueues with a rescuer which
  * will be explained in rescuer_thread().
+ *
+ * Return: 0
  */
 static int worker_thread(void *__worker)
 {
  * those works so that forward progress can be guaranteed.
  *
  * This should happen rarely.
+ *
+ * Return: 0
  */
 static int rescuer_thread(void *__rescuer)
 {
  * CONTEXT:
  * mutex_lock(wq->mutex).
  *
- * RETURNS:
+ * Return:
  * %true if @flush_color >= 0 and there's something to flush.  %false
  * otherwise.
  */
  * Wait until @work has finished execution.  @work is guaranteed to be idle
  * on return if it hasn't been requeued since flush started.
  *
- * RETURNS:
+ * Return:
  * %true if flush_work() waited for the work to finish execution,
  * %false if it was already idle.
  */
  * The caller must ensure that the workqueue on which @work was last
  * queued can't be destroyed before this function returns.
  *
- * RETURNS:
+ * Return:
  * %true if @work was pending, %false otherwise.
  */
 bool cancel_work_sync(struct work_struct *work)
  * immediate execution.  Like flush_work(), this function only
  * considers the last queueing instance of @dwork.
  *
- * RETURNS:
+ * Return:
  * %true if flush_work() waited for the work to finish execution,
  * %false if it was already idle.
  */
  * cancel_delayed_work - cancel a delayed work
  * @dwork: delayed_work to cancel
  *
- * Kill off a pending delayed_work.  Returns %true if @dwork was pending
+ * Kill off a pending delayed_work.
- * and canceled; %false if wasn't pending.  Note that the work callback
+ *
- * function may still be running on return, unless it returns %true and the
+ * Return: %true if @dwork was pending and canceled; %false if it wasn't
- * work doesn't re-arm itself.  Explicitly flush or use
+ * pending.
- * cancel_delayed_work_sync() to wait on it.
+ *
+ * Note:
+ * The work callback function may still be running on return, unless
+ * it returns %true and the work doesn't re-arm itself.  Explicitly flush or
+ * use cancel_delayed_work_sync() to wait on it.
  *
  * This function is safe to call from any context including IRQ handler.
  */
  *
  * This is cancel_work_sync() for delayed works.
  *
- * RETURNS:
+ * Return:
  * %true if @dwork was pending, %false otherwise.
  */
 bool cancel_delayed_work_sync(struct delayed_work *dwork)
  * system workqueue and blocks until all CPUs have completed.
  * schedule_on_each_cpu() is very slow.
  *
- * RETURNS:
+ * Return:
  * 0 on success, -errno on failure.
  */
 int schedule_on_each_cpu(work_func_t func)
  * Executes the function immediately if process context is available,
  * otherwise schedules the function for delayed execution.
  *
- * Returns:	0 - function was executed
+ * Return:	0 - function was executed
  *		1 - function was scheduled for execution
  */
 int execute_in_process_context(work_func_t fn, struct execute_work *ew)
  * apply_workqueue_attrs() may race against userland updating the
  * attributes.
  *
- * Returns 0 on success, -errno on failure.
+ * Return: 0 on success, -errno on failure.
  */
 int workqueue_sysfs_register(struct workqueue_struct *wq)
 {
  * @gfp_mask: allocation mask to use
  *
  * Allocate a new workqueue_attrs, initialize with default settings and
- * return it.  Returns NULL on failure.
+ * return it.
+ *
+ * Return: The allocated new workqueue_attr on success. %NULL on failure.
  */
 struct workqueue_attrs *alloc_workqueue_attrs(gfp_t gfp_mask)
 {
  * @pool: worker_pool to initialize
  *
  * Initiailize a newly zalloc'd @pool.  It also allocates @pool->attrs.
- * Returns 0 on success, -errno on failure.  Even on failure, all fields
+ *
+ * Return: 0 on success, -errno on failure.  Even on failure, all fields
  * inside @pool proper are initialized and put_unbound_pool() can be called
  * on @pool safely to release it.
  */
  * Obtain a worker_pool which has the same attributes as @attrs, bump the
  * reference count and return it.  If there already is a matching
  * worker_pool, it will be used; otherwise, this function attempts to
- * create a new one.  On failure, returns NULL.
+ * create a new one.
  *
  * Should be called with wq_pool_mutex held.
+ *
+ * Return: On success, a worker_pool with the same attributes as @attrs.
+ * On failure, %NULL.
  */
 static struct worker_pool *get_unbound_pool(const struct workqueue_attrs *attrs)
 {
  *
  * Calculate the cpumask a workqueue with @attrs should use on @node.  If
  * @cpu_going_down is >= 0, that cpu is considered offline during
- * calculation.  The result is stored in @cpumask.  This function returns
+ * calculation.  The result is stored in @cpumask.
- * %true if the resulting @cpumask is different from @attrs->cpumask,
- * %false if equal.
  *
  * If NUMA affinity is not enabled, @attrs->cpumask is always used.  If
  * enabled and @node has online CPUs requested by @attrs, the returned
  *
  * The caller is responsible for ensuring that the cpumask of @node stays
  * stable.
+ *
+ * Return: %true if the resulting @cpumask is different from @attrs->cpumask,
+ * %false if equal.
  */
 static bool wq_calc_node_cpumask(const struct workqueue_attrs *attrs, int node,
 				 int cpu_going_down, cpumask_t *cpumask)
  * items finish.  Note that a work item which repeatedly requeues itself
  * back-to-back will stay on its current pwq.
  *
- * Performs GFP_KERNEL allocations.  Returns 0 on success and -errno on
+ * Performs GFP_KERNEL allocations.
- * failure.
+ *
+ * Return: 0 on success and -errno on failure.
  */
 int apply_workqueue_attrs(struct workqueue_struct *wq,
 			  const struct workqueue_attrs *attrs)
  *
  * Determine whether %current is a workqueue rescuer.  Can be used from
  * work functions to determine whether it's being run off the rescuer task.
+ *
+ * Return: %true if %current is a workqueue rescuer. %false otherwise.
  */
 bool current_is_workqueue_rescuer(void)
 {
  * workqueue being congested on one CPU doesn't mean the workqueue is also
  * contested on other CPUs / NUMA nodes.
  *
- * RETURNS:
+ * Return:
  * %true if congested, %false otherwise.
  */
 bool workqueue_congested(int cpu, struct workqueue_struct *wq)
  * synchronization around this function and the test result is
  * unreliable and only useful as advisory hints or for debugging.
  *
- * RETURNS:
+ * Return:
  * OR'd bitmask of WORK_BUSY_* bits.
  */
 unsigned int work_busy(struct work_struct *work)
  * @fn: the function to run
  * @arg: the function arg
  *
- * This will return the value @fn returns.
  * It is up to the caller to ensure that the cpu doesn't go offline.
  * The caller must not hold any locks which would prevent @fn from completing.
+ *
+ * Return: The value @fn returns.
  */
 long work_on_cpu(int cpu, long (*fn)(void *), void *arg)
 {
  * CONTEXT:
  * Grabs and releases wq_pool_mutex.
  *
- * RETURNS:
+ * Return:
  * %true if some freezable workqueues are still busy.  %false if freezing
  * is complete.
  */

mm/memory-failure.c+1−1

@@ -1265,7 +1265,7 @@ void memory_failure_queue(unsigned long pfn, int trapno, int flags) · 1264 unmodified lines
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);

mm/page_alloc.c+1−1

@@ -768,7 +768,7 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order) · 767 unmodified lines
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. */
772	void __init init_cma_reserved_pageblock(struct page *page)	772	void __init init_cma_reserved_pageblock(struct page *page)
773	{	773	{
774	unsigned i = pageblock_nr_pages;	774	unsigned i = pageblock_nr_pages;

mm/page_isolation.c+4−4

@@ -226,9 +226,9 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, · 225 unmodified lines
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, · 3 unmodified lines
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,

net/sched/sch_choke.c+2−1

@@ -438,7 +438,8 @@ static int choke_change(struct Qdisc sch, struct nlattr opt) · 437 unmodified lines
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)

sound/pci/ens1370.c+1−1

@@ -1842,7 +1842,7 @@ static int snd_ensoniq_create_gameport(struct ensoniq *ensoniq, int dev) · 1841 unmodified lines
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	}

sound/pci/via82xx.c+1−1

@@ -1940,7 +1940,7 @@ static int snd_via686_create_gameport(struct via82xx chip, unsigned char legac · 1939 unmodified lines
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	}

@@ -179,7 +179,7 @@ use the PM_TRACE mechanism documented in Documentation/power/s2ram.txt . · 178 unmodified lines
179		179
180	To verify that the STR works, it is generally more convenient to use the s2ram	180	To verify that the STR works, it is generally more convenient to use the s2ram
181	tool available from http://suspend.sf.net and documented at	181	tool available from http://suspend.sf.net and documented at
182	http://en.opensuse.org/SDB:Suspend_to_RAM.	182	http://en.opensuse.org/SDB:Suspend_to_RAM (S2RAM_LINK).
183		183
184	Namely, after writing "freezer", "devices", "platform", "processors", or "core"	184	Namely, after writing "freezer", "devices", "platform", "processors", or "core"
185	into /sys/power/pm_test (available if the kernel is compiled with	185	into /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 · 8 unmodified lines
194	you to identify drivers that fail to suspend or resume their devices. They	194	you to identify drivers that fail to suspend or resume their devices. They
195	should be unloaded every time before an STR transition.	195	should be unloaded every time before an STR transition.
196		196
197	Next, you can follow the instructions at http://en.opensuse.org/s2ram to test	197	Next, you can follow the instructions at S2RAM_LINK to test the system, but if
198	the system, but if it does not work "out of the box", you may need to boot it	198	it does not work "out of the box", you may need to boot it with
199	with "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,
200	case, you may be able to search for failing drivers by following the procedure	200	you may be able to search for failing drivers by following the procedure
201	analogous to the one described in section 1. If you find some failing drivers,	201	analogous to the one described in section 1. If you find some failing drivers,
202	you will have to unload them every time before an STR transition (ie. before	202	you will have to unload them every time before an STR transition (ie. before
203	you run s2ram), and please report the problems with them.	203	you run s2ram), and please report the problems with them.

@@ -549,7 +549,7 @@ out_probe_one: · 548 unmodified lines
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) · 423 unmodified lines
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, · 1041 unmodified lines
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	*/
2033	static void	2033	static void
@@ -2586,7 +2586,7 @@ megaraid_abort_handler(struct scsi_cmnd *scp) · 552 unmodified lines
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) · 853 unmodified lines
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.