Merge tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

torvalds · torvalds · commit 8a28d67457b6 · 2015-10-28T18:59:53.000+09:00
Pull powerpc fix from Michael Ellerman:
 - powerpc/dma: dma_set_coherent_mask() should not be GPL only from Ben

* tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/dma: dma_set_coherent_mask() should not be GPL only
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
@@ -303,7 +303,7 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
 	dev->coherent_dma_mask = mask;
 	return 0;
 }
-EXPORT_SYMBOL_GPL(dma_set_coherent_mask);
+EXPORT_SYMBOL(dma_set_coherent_mask);
 
 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
 

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)`
`303`	`303`	`dev->coherent_dma_mask = mask;`
`304`	`304`	`return 0;`
`305`	`305`	`}`
`306`		`-EXPORT_SYMBOL_GPL(dma_set_coherent_mask);`
	`306`	`+EXPORT_SYMBOL(dma_set_coherent_mask);`
`307`	`307`
`308`	`308`	`#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)`
`309`	`309`