diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-18 16:04:33 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-18 16:04:33 +1000 |
| commit | caa1d631fc99940f866480c2bb88a6f5a235e7a2 (patch) | |
| tree | d09d648dbccaa7bf23deb336e8cf52acbc360b8d /arch/powerpc/include/asm/swiotlb.h | |
| parent | 1e38b7140185e384da216aff66a711df09b5afc9 (diff) | |
| parent | 905e75c46dba5f3061049277e4eb7110beedba43 (diff) | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/include/asm/swiotlb.h')
| -rw-r--r-- | arch/powerpc/include/asm/swiotlb.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h index 8979d4cd3d7..de99d6e2943 100644 --- a/arch/powerpc/include/asm/swiotlb.h +++ b/arch/powerpc/include/asm/swiotlb.h @@ -22,4 +22,10 @@ int __init swiotlb_setup_bus_notifier(void); extern void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev); +#ifdef CONFIG_SWIOTLB +void swiotlb_detect_4g(void); +#else +static inline void swiotlb_detect_4g(void) {} +#endif + #endif /* __ASM_SWIOTLB_H */ |