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

Commit 7d72e6fa authored by Chris Metcalf's avatar Chris Metcalf
Browse files

Merge branch 'master' into for-linus

parents ba00376b 2be1f3a7

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

Documentation/DMA-API-HOWTO.txt

+10 −0
Original line number Diff line number Diff line
@@ -753,6 +753,16 @@ to "Closing". 
   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

Documentation/DMA-API.txt

+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)

Documentation/DocBook/Makefile

+2 −2
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))
@@ -95,7 +95,7 @@ define rule_docproc 
        ) > $(dir $@).$(notdir $@).cmd

endef



%.xml: %.tmpl FORCE

%.xml: %.tmpl xmldoclinks FORCE

	$(call if_changed_rule,docproc)



###

Documentation/DocBook/kernel-api.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ X!Ilib/string.c 
     <title>FIFO Buffer</title>

     <sect1><title>kfifo interface</title>

!Iinclude/linux/kfifo.h

!Ekernel/kfifo.c

     </sect1>

  </chapter>