diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-07 09:43:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-07 09:43:11 +0200 |
| commit | d4f8f217b8a5d5bd02af979650418dca4caec472 (patch) | |
| tree | af047bfa9729c975e24cb7624107574e884d3a57 /arch/mn10300 | |
| parent | 2dfbf4dfbe47a484bae20456c12b40763b9b6af7 (diff) | |
| parent | 773e3f93577ffb493fb7c39b1a6ecf39b5748e87 (diff) | |
| download | kernel_samsung_smdk4412-d4f8f217b8a5d5bd02af979650418dca4caec472.zip kernel_samsung_smdk4412-d4f8f217b8a5d5bd02af979650418dca4caec472.tar.gz kernel_samsung_smdk4412-d4f8f217b8a5d5bd02af979650418dca4caec472.tar.bz2 | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/mm/dma-alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 4e34880..159acb0 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c @@ -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; |