Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 209788
b: refs/heads/master
c: 6e0c64f
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Aug 23, 2010
1 parent ce9af99 commit f77de1c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dc4c26bfedcdd2b52231864c130bee2388e0eae4
refs/heads/master: 6e0c64f4ddf4a76a04108c1e24132d5d7dea8872
3 changes: 2 additions & 1 deletion trunk/arch/mn10300/mm/dma-alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
unsigned long addr;
void *ret;

printk("dma_alloc_coherent(%s,%zu,,%x)\n", dev_name(dev), size, gfp);
pr_debug("dma_alloc_coherent(%s,%zu,%x)\n",
dev ? dev_name(dev) : "?", size, gfp);

if (0xbe000000 - pci_sram_allocated >= size) {
size = (size + 255) & ~255;
Expand Down

0 comments on commit f77de1c

Please sign in to comment.