Merge branch 'fix/misc' into topic/misc (e7cfbea9) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/00-INDEX

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,8 +130,6 @@ edac.txt
		- information on EDAC - Error Detection And Correction
		eisa.txt
		- info on EISA bus support.
		exception.txt
		- how Linux v2.2 handles exceptions without verify_area etc.
		fault-injection/
		- dir with docs about the fault injection capabilities infrastructure.
		fb/
		@@ -234,6 +232,8 @@ memory.txt
		- info on typical Linux memory problems.
		mips/
		- directory with info about Linux on MIPS architecture.
		mmc/
		- directory with info about the MMC subsystem
		mono.txt
		- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
		mutex-design.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,15 @@ Description:
		0 -> resumed

		(_UDC_ is the name of the USB Device Controller driver)

		What: /sys/devices/platform/_UDC_/gadget/gadget-lunX/nofua
		Date: July 2010
		Contact: Andy Shevchenko <andy.shevchenko@gmail.com>
		Description:
		Show or set the reaction on the FUA (Force Unit Access) bit in
		the SCSI WRITE(10,12) commands when a gadget in USB Mass
		Storage mode.

		Possible values are:
		1 -> ignore the FUA flag
		0 -> obey the FUA flag

+13 −3

Original line number	Diff line number	Diff line
		@@ -738,21 +738,31 @@ to "Closing".
		CONFIG_NEED_SG_DMA_LENGTH if the architecture supports IOMMUs
		(including software IOMMU).

		2) ARCH_KMALLOC_MINALIGN
		2) ARCH_DMA_MINALIGN

		Architectures must ensure that kmalloc'ed buffer is
		DMA-safe. Drivers and subsystems depend on it. If an architecture
		isn't fully DMA-coherent (i.e. hardware doesn't ensure that data in
		the CPU cache is identical to data in main memory),
		ARCH_KMALLOC_MINALIGN must be set so that the memory allocator
		ARCH_DMA_MINALIGN must be set so that the memory allocator
		makes sure that kmalloc'ed buffer doesn't share a cache line with
		the others. See arch/arm/include/asm/cache.h as an example.

		Note that ARCH_KMALLOC_MINALIGN is about DMA memory alignment
		Note that ARCH_DMA_MINALIGN is about DMA memory alignment
		constraints. You don't need to worry about the architecture data
		alignment constraints (e.g. the alignment constraints about 64-bit
		objects).

		3) Supporting multiple types of IOMMUs

		If your architecture needs to support multiple types of IOMMUs, you
		can use include/linux/asm-generic/dma-mapping-common.h. It's a
		library to support the DMA API with multiple types of IOMMUs. Lots
		of architectures (x86, powerpc, sh, alpha, ia64, microblaze and
		sparc) use it. Choose one to see how it can be used. If you need to
		support multiple types of IOMMUs in a single system, the example of
		x86 or powerpc helps.

		Closing

		This document, and the API itself, would not be in its current

+0 −6

Original line number	Diff line number	Diff line
		@@ -455,12 +455,6 @@ Free memory allocated by the nonconsistent API. All parameters must
		be identical to those passed in (and returned by
		dma_alloc_noncoherent()).

		int
		dma_is_consistent(struct device *dev, dma_addr_t dma_handle)

		Returns true if the device dev is performing consistent DMA on the memory
		area pointed to by the dma_handle.

		int
		dma_get_cache_alignment(void)

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ PS_METHOD = $(prefer-db2x)
		PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks

		BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
		xmldocs: $(BOOKS) xmldoclinks
		xmldocs: $(BOOKS)
		sgmldocs: xmldocs

		PS := $(patsubst %.xml, %.ps, $(BOOKS))
		@@ -45,7 +45,7 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
		pdfdocs: $(PDF)

		HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
		htmldocs: $(HTML)
		htmldocs: $(HTML) xmldoclinks
		$(call build_main_index)
		$(call build_images)

		@@ -95,7 +95,7 @@ define rule_docproc
		) > $(dir $@).$(notdir $@).cmd
		endef

		%.xml: %.tmpl FORCE
		%.xml: %.tmpl xmldoclinks FORCE
		$(call if_changed_rule,docproc)

		###