Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing (416dfdcd) · Commits · jan.koester / Linux

.gitignore

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ include/linux/compile.h
	include/linux/version.h		include/linux/version.h
	include/linux/utsrelease.h		include/linux/utsrelease.h
	include/linux/bounds.h		include/linux/bounds.h
			include/generated

	# stgit generated dirs		# stgit generated dirs
	patches-*		patches-*

Documentation/ABI/testing/debugfs-pktcdvd

+3 −3

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

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

	Example:		Example:
	-------		-------

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

Documentation/DMA-mapping.txt

+9 −9

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

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

	int using_dac;		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;		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;		using_dac = 0;
	} else {		} else {
	printk(KERN_WARNING		printk(KERN_WARNING
	@@ -170,14 +170,14 @@ the case would look like this:

	int using_dac, consistent_using_dac;		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;		using_dac = 1;
	consistent_using_dac = 1;		consistent_using_dac = 1;
	pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
	} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {		} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
	using_dac = 0;		using_dac = 0;
	consistent_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 {		} else {
	printk(KERN_WARNING		printk(KERN_WARNING
	"mydev: No suitable DMA available.\n");		"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		Finally, if your device can only drive the low 24-bits of
	address during PCI bus mastering you might do something like:		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		printk(KERN_WARNING
	"mydev: 24-bit DMA addressing not available.\n");		"mydev: 24-bit DMA addressing not available.\n");
	goto ignore_this_device;		goto ignore_this_device;
	@@ -213,7 +213,7 @@ most specific mask.

	Here is pseudo-code showing how this might be done:		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		#define RECORD_ADDRESS_BITS 0x00ffffff

	struct my_sound_card *card;		struct my_sound_card *card;

Documentation/DocBook/Makefile

+8 −3

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

	###		###
	# The targets that may be used.		# 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))		BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
	xmldocs: $(BOOKS)		xmldocs: $(BOOKS)
	@@ -213,11 +213,12 @@ silent_gen_xml = :
	dochelp:		dochelp:
	@echo ' Linux kernel internal documentation in different formats:'		@echo ' Linux kernel internal documentation in different formats:'
	@echo ' htmldocs - HTML'		@echo ' htmldocs - HTML'
	@echo ' installmandocs - install man pages generated by mandocs'
	@echo ' mandocs - man pages'
	@echo ' pdfdocs - PDF'		@echo ' pdfdocs - PDF'
	@echo ' psdocs - Postscript'		@echo ' psdocs - Postscript'
	@echo ' xmldocs - XML DocBook'		@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		# Temporary files left by various tools
	@@ -235,6 +236,10 @@ clean-files := $(DOCBOOKS) \

	clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man		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		# 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.		# information in a variable se we can use it in if_changed and friends.

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

+4 −4

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