lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into core/iommu

Browse Source
This commit is contained in:
Ingo Molnar
2009-01-11 00:51:06 +01:00
parent c299030765 3d14bdad40
commit 0811a433c6
3455 changed files with 642819 additions and 75167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/swiotlb.c
View File

@@ -619,7 +619,7 @@ swiotlb_full(struct device *dev, size_t size, int dir, int do_panic)
* the damage, or panic when the transfer is too big.
*/
printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at "
"device %s\n", size, dev ? dev->bus_id : "?");
"device %s\n", size, dev ? dev_name(dev) : "?");
if (size > io_tlb_overflow && do_panic) {
if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)