Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 93c36ed8348934b462044d2d60ab345055318933

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent 3a355cc61d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

dma-debug: fix printk formats (i386) 

Fix printk format warnings in dma-debug:

  lib/dma-debug.c:645: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'
  lib/dma-debug.c:662: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'
  lib/dma-debug.c:676: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'
  lib/dma-debug.c:686: warning: format '%016llx' expects type 'long long unsigned int', but argument 6 has type 'dma_addr_t'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -648,7 +648,7 @@
648 648 err_printk(dev, NULL, "DMA-API: device driver tries "
649 649 "to sync DMA memory it has not allocated "
650 650 "[device address=0x%016llx] [size=%llu bytes]\n",
651   - addr, size);
  651 + (unsigned long long)addr, size);
652 652 goto out;
653 653 }
654 654  
... ... @@ -666,7 +666,7 @@
666 666 "DMA memory with different direction "
667 667 "[device address=0x%016llx] [size=%llu bytes] "
668 668 "[mapped with %s] [synced with %s]\n",
669   - addr, entry->size,
  669 + (unsigned long long)addr, entry->size,
670 670 dir2name[entry->direction],
671 671 dir2name[direction]);
672 672 }
... ... @@ -680,7 +680,7 @@
680 680 "device read-only DMA memory for cpu "
681 681 "[device address=0x%016llx] [size=%llu bytes] "
682 682 "[mapped with %s] [synced with %s]\n",
683   - addr, entry->size,
  683 + (unsigned long long)addr, entry->size,
684 684 dir2name[entry->direction],
685 685 dir2name[direction]);
686 686  
... ... @@ -690,7 +690,7 @@
690 690 "device write-only DMA memory to device "
691 691 "[device address=0x%016llx] [size=%llu bytes] "
692 692 "[mapped with %s] [synced with %s]\n",
693   - addr, entry->size,
  693 + (unsigned long long)addr, entry->size,
694 694 dir2name[entry->direction],
695 695 dir2name[direction]);
696 696