Commit 1399ff54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Fix typos in drivers/isdn/hisax/isdnl2.c
  Fix typos in doc and comments
  BUG_ON conversion for fs/aio.c
  BUG_ON conversion for drivers/mmc/omap.c
  BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
  Fix misc .c/.h comment typos
  Fix misc Kconfig typos
  Fix typos in /Documentation : Misc
  Fix typos in /Documentation : 'U-Z'
  Fix typos in /Documentation : 'T''
  Fix jiffies.h comment
  tabify MAINTAINERS
  fix spelling error in include/linux/kernel.h
  mqueue.h: don't include linux/types.h
parents bb37b94c 6b44d4e6

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ udev 
----

udev is a userspace application for populating /dev dynamically with

only entries for devices actually present.  udev replaces the basic

functionality of devfs, while allowing persistant device naming for

functionality of devfs, while allowing persistent device naming for

devices.



FUSE

Documentation/DMA-API.txt

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ size is the size of the area (must be multiples of PAGE_SIZE). 
flags can be or'd together and are



DMA_MEMORY_MAP - request that the memory returned from

dma_alloc_coherent() be directly writeable.

dma_alloc_coherent() be directly writable.



DMA_MEMORY_IO - request that the memory returned from

dma_alloc_coherent() be addressable using read/write/memcpy_toio etc.

Documentation/DMA-ISA-LPC.txt

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ lock. 


Once the DMA transfer is finished (or timed out) you should disable

the channel again. You should also check get_dma_residue() to make

sure that all data has been transfered.

sure that all data has been transferred.



Example:

Documentation/MSI-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ into the field vector of each element contained in a second argument. 
Note that the pre-assigned IOAPIC dev->irq is valid only if the device

operates in PIN-IRQ assertion mode. In MSI-X mode, any attempt at

using dev->irq by the device driver to request for interrupt service

may result unpredictabe behavior.

may result in unpredictable behavior.



For each MSI-X vector granted, a device driver is responsible for calling

other functions like request_irq(), enable_irq(), etc. to enable

Documentation/accounting/taskstats.txt

+5 −5
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ a) TASKSTATS_TYPE_AGGR_PID/TGID : attribute containing no payload but indicates 
a pid/tgid will be followed by some stats.



b) TASKSTATS_TYPE_PID/TGID: attribute whose payload is the pid/tgid whose stats

is being returned.

are being returned.



c) TASKSTATS_TYPE_STATS: attribute with a struct taskstsats as payload. The

c) TASKSTATS_TYPE_STATS: attribute with a struct taskstats as payload. The

same structure is used for both per-pid and per-tgid stats.



3. New message sent by kernel whenever a task exits. The payload consists of a
@@ -122,12 +122,12 @@ of atomicity). 


However, maintaining per-process, in addition to per-task stats, within the

kernel has space and time overheads. To address this, the taskstats code

accumalates each exiting task's statistics into a process-wide data structure.

When the last task of a process exits, the process level data accumalated also

accumulates each exiting task's statistics into a process-wide data structure.

When the last task of a process exits, the process level data accumulated also

gets sent to userspace (along with the per-task data).



When a user queries to get per-tgid data, the sum of all other live threads in

the group is added up and added to the accumalated total for previously exited

the group is added up and added to the accumulated total for previously exited

threads of the same thread group.



Extending taskstats

CRA Git | Maintained and supported by SUSTech CRA and CCSE