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
  ...
This commit is contained in:
Linus Torvalds
2013-09-06 09:36:28 -07:00
106 changed files with 269 additions and 204 deletions
+5 -6
View File
@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096
S: Bellevue, Washington 98007 S: Bellevue, Washington 98007
S: USA S: USA
N: Christopher L. Cheney N: Chris Cheney
E: ccheney@debian.org E: chris.cheney@gmail.com
E: ccheney@cheney.cx E: ccheney@redhat.com
W: http://www.cheney.cx
P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2 P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2
D: Vista Imaging usb webcam driver D: Vista Imaging usb webcam driver
S: 314 Prince of Wales S: 2308 Therrell Way
S: Conroe, TX 77304 S: McKinney, TX 75070
S: USA S: USA
N: Stuart Cheshire N: Stuart Cheshire
+1 -1
View File
@@ -40,7 +40,7 @@ IPMI.txt
IRQ-affinity.txt IRQ-affinity.txt
- how to select which CPU(s) handle which interrupt events on SMP. - how to select which CPU(s) handle which interrupt events on SMP.
IRQ-domain.txt IRQ-domain.txt
- info on inerrupt numbering and setting up IRQ domains. - info on interrupt numbering and setting up IRQ domains.
IRQ.txt IRQ.txt
- description of what an IRQ is. - description of what an IRQ is.
Intel-IOMMU.txt Intel-IOMMU.txt
+5 -4
View File
@@ -5,20 +5,21 @@ Description:
The disksize file is read-write and specifies the disk size The disksize file is read-write and specifies the disk size
which represents the limit on the *uncompressed* worth of data which represents the limit on the *uncompressed* worth of data
that can be stored in this disk. that can be stored in this disk.
Unit: bytes
What: /sys/block/zram<id>/initstate What: /sys/block/zram<id>/initstate
Date: August 2010 Date: August 2010
Contact: Nitin Gupta <ngupta@vflare.org> Contact: Nitin Gupta <ngupta@vflare.org>
Description: 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. state of the device.
What: /sys/block/zram<id>/reset What: /sys/block/zram<id>/reset
Date: August 2010 Date: August 2010
Contact: Nitin Gupta <ngupta@vflare.org> Contact: Nitin Gupta <ngupta@vflare.org>
Description: 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. with this device.
What: /sys/block/zram<id>/num_reads What: /sys/block/zram<id>/num_reads
@@ -48,7 +49,7 @@ Contact: Nitin Gupta <ngupta@vflare.org>
Description: Description:
The notify_free file is read-only and specifies the number of The notify_free file is read-only and specifies the number of
swap slot free notifications received by this device. These 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 is freed. This statistic is applicable only when this disk is
being used as a swap disk. being used as a swap disk.
@@ -132,7 +132,7 @@ devices.</para>
<row> <row>
<entry>&v4l2-fract;</entry> <entry>&v4l2-fract;</entry>
<entry><structfield>timeperframe</structfield></entry> <entry><structfield>timeperframe</structfield></entry>
<entry><para>This is is the desired period between <entry><para>This is the desired period between
successive frames captured by the driver, in seconds. The successive frames captured by the driver, in seconds. The
field is intended to skip frames on the driver side, saving I/O field is intended to skip frames on the driver side, saving I/O
bandwidth.</para><para>Applications store here the desired frame bandwidth.</para><para>Applications store here the desired frame
@@ -193,7 +193,7 @@ applications must set the array to zero.</entry>
<row> <row>
<entry>&v4l2-fract;</entry> <entry>&v4l2-fract;</entry>
<entry><structfield>timeperframe</structfield></entry> <entry><structfield>timeperframe</structfield></entry>
<entry>This is is the desired period between <entry>This is the desired period between
successive frames output by the driver, in seconds.</entry> successive frames output by the driver, in seconds.</entry>
</row> </row>
<row> <row>
+2 -2
View File
@@ -57,8 +57,8 @@ i.e counters for the CPU0-3 did not change.
Here is an example of limiting that same irq (44) to cpus 1024 to 1031: Here is an example of limiting that same irq (44) to cpus 1024 to 1031:
[root@moon 44]# echo 1024-1031 > smp_affinity [root@moon 44]# echo 1024-1031 > smp_affinity_list
[root@moon 44]# cat smp_affinity [root@moon 44]# cat smp_affinity_list
1024-1031 1024-1031
Note that to do this with a bitmask would require 32 bitmasks of zero Note that to do this with a bitmask would require 32 bitmasks of zero
+10
View File
@@ -109,6 +109,16 @@ probably didn't even receive earlier versions of the patch.
If the patch fixes a logged bug entry, refer to that bug entry by If the patch fixes a logged bug entry, refer to that bug entry by
number and URL. number and URL.
If you want to refer to a specific commit, don't just refer to the
SHA-1 ID of the commit. Please also include the oneline summary of
the commit, to make it easier for reviewers to know what it is about.
Example:
Commit e21d2170f36602ae2708 ("video: remove unnecessary
platform_set_drvdata()") removed the unnecessary
platform_set_drvdata(), but left the variable "dev" unused,
delete it.
3) Separate your changes. 3) Separate your changes.
+1 -1
View File
@@ -207,7 +207,7 @@ passing those. One idea is to return this in _DSM method like:
Return (Local0) Return (Local0)
} }
Then the at25 SPI driver can get this configation by calling _DSM on its Then the at25 SPI driver can get this configuration by calling _DSM on its
ACPI handle like: ACPI handle like:
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
+1 -1
View File
@@ -78,7 +78,7 @@ to NULL. Drivers should use the following idiom:
The most common usage of these functions will probably be to specify The most common usage of these functions will probably be to specify
the maximum time from when an interrupt occurs, to when the device the maximum time from when an interrupt occurs, to when the device
becomes accessible. To accomplish this, driver writers should use the becomes accessible. To accomplish this, driver writers should use the
set_max_mpu_wakeup_lat() function to to constrain the MPU wakeup set_max_mpu_wakeup_lat() function to constrain the MPU wakeup
latency, and the set_max_dev_wakeup_lat() function to constrain the latency, and the set_max_dev_wakeup_lat() function to constrain the
device wakeup latency (from clk_enable() to accessibility). For device wakeup latency (from clk_enable() to accessibility). For
example, example,
+1 -1
View File
@@ -69,7 +69,7 @@ one, this value should be decreased relative to fifo_expire_async.
group_idle group_idle
----------- -----------
This parameter forces idling at the CFQ group level instead of CFQ This parameter forces idling at the CFQ group level instead of CFQ
queue level. This was introduced after after a bottleneck was observed queue level. This was introduced after a bottleneck was observed
in higher end storage due to idle on sequential queue and allow dispatch in higher end storage due to idle on sequential queue and allow dispatch
from a single queue. The idea with this parameter is that it can be run with from a single queue. The idea with this parameter is that it can be run with
slice_idle=0 and group_idle=8, so that idling does not happen on individual slice_idle=0 and group_idle=8, so that idling does not happen on individual
+3 -3
View File
@@ -57,7 +57,7 @@ changes occur:
interface must make sure that any previous page table interface must make sure that any previous page table
modifications for the address space 'vma->vm_mm' in the range modifications for the address space 'vma->vm_mm' in the range
'start' to 'end-1' will be visible to the cpu. That is, after 'start' to 'end-1' will be visible to the cpu. That is, after
running, here will be no entries in the TLB for 'mm' for running, there will be no entries in the TLB for 'mm' for
virtual addresses in the range 'start' to 'end-1'. virtual addresses in the range 'start' to 'end-1'.
The "vma" is the backing store being used for the region. The "vma" is the backing store being used for the region.
@@ -375,8 +375,8 @@ maps this page at its virtual address.
void flush_icache_page(struct vm_area_struct *vma, struct page *page) void flush_icache_page(struct vm_area_struct *vma, struct page *page)
All the functionality of flush_icache_page can be implemented in All the functionality of flush_icache_page can be implemented in
flush_dcache_page and update_mmu_cache. In 2.7 the hope is to flush_dcache_page and update_mmu_cache. In the future, the hope
remove this interface completely. is to remove this interface completely.
The final category of APIs is for I/O to deliberately aliased address The final category of APIs is for I/O to deliberately aliased address
ranges inside the kernel. Such aliases are set up by use of the ranges inside the kernel. Such aliases are set up by use of the
+1 -1
View File
@@ -22,7 +22,7 @@ to /proc/cpuinfo.
4) /sys/devices/system/cpu/cpuX/topology/thread_siblings: 4) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
internel kernel map of cpuX's hardware threads within the same internal kernel map of cpuX's hardware threads within the same
core as cpuX core as cpuX
5) /sys/devices/system/cpu/cpuX/topology/core_siblings: 5) /sys/devices/system/cpu/cpuX/topology/core_siblings:
+2 -2
View File
@@ -276,7 +276,7 @@ mainline get there via -mm.
The current -mm patch is available in the "mmotm" (-mm of the moment) The current -mm patch is available in the "mmotm" (-mm of the moment)
directory at: directory at:
http://userweb.kernel.org/~akpm/mmotm/ http://www.ozlabs.org/~akpm/mmotm/
Use of the MMOTM tree is likely to be a frustrating experience, though; Use of the MMOTM tree is likely to be a frustrating experience, though;
there is a definite chance that it will not even compile. 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.
Linux-next trees are announced on the linux-kernel and linux-next mailing Linux-next trees are announced on the linux-kernel and linux-next mailing
lists when they are assembled; they can be downloaded from: lists when they are assembled; they can be downloaded from:
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/ http://www.kernel.org/pub/linux/kernel/next/
Some information about linux-next has been gathered at: Some information about linux-next has been gathered at:
@@ -22,7 +22,7 @@ This contains the board-specific information.
- compatible: must be "stericsson,s365". - compatible: must be "stericsson,s365".
- vana15-supply: the regulator supplying the 1.5V to drive the - vana15-supply: the regulator supplying the 1.5V to drive the
board. board.
- syscon: a pointer to the syscon node so we can acccess the - syscon: a pointer to the syscon node so we can access the
syscon registers to set the board as self-powered. syscon registers to set the board as self-powered.
Example: Example:
@@ -32,8 +32,8 @@ numbers - see motherboard's TRM for more details.
The node describing a config device must refer to the sysreg node via The node describing a config device must refer to the sysreg node via
"arm,vexpress,config-bridge" phandle (can be also defined in the node's "arm,vexpress,config-bridge" phandle (can be also defined in the node's
parent) and relies on the board topology properties - see main vexpress parent) and relies on the board topology properties - see main vexpress
node documentation for more details. It must must also define the node documentation for more details. It must also define the following
following property: property:
- arm,vexpress-sysreg,func : must contain two cells: - arm,vexpress-sysreg,func : must contain two cells:
- first cell defines function number (eg. 1 for clock generator, - first cell defines function number (eg. 1 for clock generator,
2 for voltage regulators etc.) 2 for voltage regulators etc.)
@@ -5,7 +5,7 @@ TI C6X SoCs contain a region of miscellaneous registers which provide various
function for SoC control or status. Details vary considerably among from SoC function for SoC control or status. Details vary considerably among from SoC
to SoC with no two being alike. to SoC with no two being alike.
In general, the Device State Configuraion Registers (DSCR) will provide one or In general, the Device State Configuration Registers (DSCR) will provide one or
more configuration registers often protected by a lock register where one or more configuration registers often protected by a lock register where one or
more key values must be written to a lock register in order to unlock the more key values must be written to a lock register in order to unlock the
configuration register for writes. These configuration register may be used to configuration register for writes. These configuration register may be used to
@@ -2,7 +2,7 @@
The Samsung Audio Subsystem clock controller generates and supplies clocks The Samsung Audio Subsystem clock controller generates and supplies clocks
to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock
binding described here is applicable to all SoC's in Exynos family. binding described here is applicable to all SoCs in Exynos family.
Required Properties: Required Properties:
@@ -17,7 +17,7 @@ Optional properties for the SRC node:
- disable-mxtal: if present this will disable the MXTALO, - disable-mxtal: if present this will disable the MXTALO,
i.e. the driver output for the main (~19.2 MHz) chrystal, i.e. the driver output for the main (~19.2 MHz) chrystal,
if the board has its own circuitry for providing this if the board has its own circuitry for providing this
osciallator oscillator
PLL nodes: these nodes represent the two PLLs on the system, PLL nodes: these nodes represent the two PLLs on the system,
@@ -18,14 +18,14 @@ dma0: dma@ffffec00 {
DMA clients connected to the Atmel DMA controller must use the format DMA clients connected to the Atmel DMA controller must use the format
described in the dma.txt file, using a three-cell specifier for each channel: described in the dma.txt file, using a three-cell specifier for each channel:
a phandle plus two interger cells. a phandle plus two integer cells.
The three cells in order are: The three cells in order are:
1. A phandle pointing to the DMA controller. 1. A phandle pointing to the DMA controller.
2. The memory interface (16 most significant bits), the peripheral interface 2. The memory interface (16 most significant bits), the peripheral interface
(16 less significant bits). (16 less significant bits).
3. Parameters for the at91 DMA configuration register which are device 3. Parameters for the at91 DMA configuration register which are device
dependant: dependent:
- bit 7-0: peripheral identifier for the hardware handshaking interface. The - bit 7-0: peripheral identifier for the hardware handshaking interface. The
identifier can be different for tx and rx. identifier can be different for tx and rx.
- bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP. - bit 11-8: FIFO configuration. 0 for half FIFO, 1 for ALAP, 1 for ASAP.
@@ -34,7 +34,7 @@ Clients have to specify the DMA requests with phandles in a list.
Required properties: Required properties:
- dmas: List of one or more DMA request specifiers. One DMA request specifier - dmas: List of one or more DMA request specifiers. One DMA request specifier
consists of a phandle to the DMA controller followed by the integer consists of a phandle to the DMA controller followed by the integer
specifiying the request line. specifying the request line.
- dma-names: List of string identifiers for the DMA requests. For the correct - dma-names: List of string identifiers for the DMA requests. For the correct
names, have a look at the specific client driver. names, have a look at the specific client driver.
@@ -37,14 +37,14 @@ Each dmas request consists of 4 cells:
1. A phandle pointing to the DMA controller 1. A phandle pointing to the DMA controller
2. Device Type 2. Device Type
3. The DMA request line number (only when 'use fixed channel' is set) 3. The DMA request line number (only when 'use fixed channel' is set)
4. A 32bit mask specifying; mode, direction and endianess [NB: This list will grow] 4. A 32bit mask specifying; mode, direction and endianness [NB: This list will grow]
0x00000001: Mode: 0x00000001: Mode:
Logical channel when unset Logical channel when unset
Physical channel when set Physical channel when set
0x00000002: Direction: 0x00000002: Direction:
Memory to Device when unset Memory to Device when unset
Device to Memory when set Device to Memory when set
0x00000004: Endianess: 0x00000004: Endianness:
Little endian when unset Little endian when unset
Big endian when set Big endian when set
0x00000008: Use fixed channel: 0x00000008: Use fixed channel:

Some files were not shown because too many files have changed in this diff Show More