Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge (5bd3ef84) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/ABI/testing/debugfs-pktcdvd

+3 −3

Original line number	Diff line number	Diff line
		What: /debug/pktcdvd/pktcdvd[0-7]
		What: /sys/kernel/debug/pktcdvd/pktcdvd[0-7]
		Date: Oct. 2006
		KernelVersion: 2.6.20
		Contact: Thomas Maier <balagi@justmail.de>
		@@ -10,10 +10,10 @@ debugfs interface
		The pktcdvd module (packet writing driver) creates
		these files in debugfs:

		/debug/pktcdvd/pktcdvd[0-7]/
		/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/
		info (0444) Lots of driver statistics and infos.

		Example:
		-------

		cat /debug/pktcdvd/pktcdvd0/info
		cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

Documentation/DMA-mapping.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ exactly why.
		The standard 32-bit addressing PCI device would do something like
		this:

		if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
		printk(KERN_WARNING
		"mydev: No suitable DMA available.\n");
		goto ignore_this_device;
		@@ -155,9 +155,9 @@ all 64-bits when accessing streaming DMA:

		int using_dac;

		if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
		if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
		using_dac = 1;
		} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
		} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
		using_dac = 0;
		} else {
		printk(KERN_WARNING
		@@ -170,14 +170,14 @@ the case would look like this:

		int using_dac, consistent_using_dac;

		if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
		if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
		using_dac = 1;
		consistent_using_dac = 1;
		pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
		} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
		} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
		using_dac = 0;
		consistent_using_dac = 0;
		pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
		} else {
		printk(KERN_WARNING
		"mydev: No suitable DMA available.\n");
		@@ -192,7 +192,7 @@ check the return value from pci_set_consistent_dma_mask().
		Finally, if your device can only drive the low 24-bits of
		address during PCI bus mastering you might do something like:

		if (pci_set_dma_mask(pdev, DMA_24BIT_MASK)) {
		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(24))) {
		printk(KERN_WARNING
		"mydev: 24-bit DMA addressing not available.\n");
		goto ignore_this_device;
		@@ -213,7 +213,7 @@ most specific mask.

		Here is pseudo-code showing how this might be done:

		#define PLAYBACK_ADDRESS_BITS DMA_32BIT_MASK
		#define PLAYBACK_ADDRESS_BITS DMA_BIT_MASK(32)
		#define RECORD_ADDRESS_BITS 0x00ffffff

		struct my_sound_card *card;

Documentation/DocBook/Makefile

+8 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ PS_METHOD = $(prefer-db2x)

		###
		# The targets that may be used.
		PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs
		PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs

		BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
		xmldocs: $(BOOKS)
		@@ -213,11 +213,12 @@ silent_gen_xml = :
		dochelp:
		@echo ' Linux kernel internal documentation in different formats:'
		@echo ' htmldocs - HTML'
		@echo ' installmandocs - install man pages generated by mandocs'
		@echo ' mandocs - man pages'
		@echo ' pdfdocs - PDF'
		@echo ' psdocs - Postscript'
		@echo ' xmldocs - XML DocBook'
		@echo ' mandocs - man pages'
		@echo ' installmandocs - install man pages generated by mandocs'
		@echo ' cleandocs - clean all generated DocBook files'

		###
		# Temporary files left by various tools
		@@ -235,6 +236,10 @@ clean-files := $(DOCBOOKS) \

		clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man

		cleandocs:
		$(Q)rm -f $(call objectify, $(clean-files))
		$(Q)rm -rf $(call objectify, $(clean-dirs))

		# Declare the contents of the .PHONY variable as phony. We keep that
		# information in a variable se we can use it in if_changed and friends.

Documentation/DocBook/kernel-api.tmpl

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ X!Earch/x86/kernel/mca_32.c
		!Eblock/blk-tag.c
		!Iblock/blk-tag.c
		!Eblock/blk-integrity.c
		!Iblock/blktrace.c
		!Ikernel/trace/blktrace.c
		!Iblock/genhd.c
		!Eblock/genhd.c
		</chapter>

Documentation/DocBook/writing-an-alsa-driver.tmpl

+4 −4

Original line number	Diff line number	Diff line
		@@ -1137,8 +1137,8 @@
		if (err < 0)
		return err;
		/* check PCI availability (28bit DMA) */
		if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 \|\|
		pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
		if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 \|\|
		pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
		printk(KERN_ERR "error to set 28bit mask DMA\n");
		pci_disable_device(pci);
		return -ENXIO;
		@@ -1252,8 +1252,8 @@
		err = pci_enable_device(pci);
		if (err < 0)
		return err;
		if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 \|\|
		pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
		if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 \|\|
		pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
		printk(KERN_ERR "error to set 28bit mask DMA\n");
		pci_disable_device(pci);
		return -ENXIO;