Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c7145a1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/spinlocks 

Done to prevent this failure of an Octopus merge:

 Added arch/arm/include/asm/byteorder.h in both, but differently.
 ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
 Auto-merging include/asm-x86/spinlock.h
 ERROR: Merge conflict in include/asm-x86/spinlock.h
 fatal: merge program failed
parents 74e91604 fd048088

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ mono.txt 
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

moxa-smartio

	- file with info on installing/using Moxa multiport serial driver.

mtrr.txt

	- how to use PPro Memory Type Range Registers to increase performance.

mutex-design.txt

	- info on the generic mutex subsystem.

namespaces/

Documentation/ABI/testing/sysfs-gpio

0 → 100644
+26 −0
Original line number Diff line number Diff line 
What:		/sys/class/gpio/

Date:		July 2008

KernelVersion:	2.6.27

Contact:	David Brownell <dbrownell@users.sourceforge.net>

Description:



  As a Kconfig option, individual GPIO signals may be accessed from

  userspace.  GPIOs are only made available to userspace by an explicit

  "export" operation.  If a given GPIO is not claimed for use by

  kernel code, it may be exported by userspace (and unexported later).

  Kernel code may export it for complete or partial access.



  GPIOs are identified as they are inside the kernel, using integers in

  the range 0..INT_MAX.  See Documentation/gpio.txt for more information.



    /sys/class/gpio

	/export ... asks the kernel to export a GPIO to userspace

	/unexport ... to return a GPIO to the kernel

	/gpioN ... for each exported GPIO #N

	    /value ... always readable, writes fail for input GPIOs

	    /direction ... r/w as: in, out (default low); write: high, low

	/gpiochipN ... for each gpiochip; #N is its first GPIO

	    /base ... (r/o) same as N

	    /label ... (r/o) descriptive, not necessarily unique

	    /ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)

Documentation/DMA-API.txt

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this: 
	int i, count = dma_map_sg(dev, sglist, nents, direction);

	struct scatterlist *sg;



	for (i = 0, sg = sglist; i < count; i++, sg++) {

	for_each_sg(sglist, sg, count, i) {

		hw_address[i] = sg_dma_address(sg);

		hw_len[i] = sg_dma_len(sg);

	}

Documentation/DMA-mapping.txt

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ failure can be determined by: 
	dma_addr_t dma_handle;



	dma_handle = pci_map_single(pdev, addr, size, direction);

	if (pci_dma_mapping_error(dma_handle)) {

	if (pci_dma_mapping_error(pdev, dma_handle)) {

		/*

		 * reduce current DMA mapping usage,

		 * delay and try again later or