Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] drivers/dma trivial annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds
47b16539 c714de5d

+4 -4
+2 -2
drivers/dma/ioatdma.c
··· 80 80 81 81 static struct ioat_desc_sw *ioat_dma_alloc_descriptor( 82 82 struct ioat_dma_chan *ioat_chan, 83 - int flags) 83 + gfp_t flags) 84 84 { 85 85 struct ioat_dma_descriptor *desc; 86 86 struct ioat_desc_sw *desc_sw; ··· 686 686 { 687 687 int err; 688 688 unsigned long mmio_start, mmio_len; 689 - void *reg_base; 689 + void __iomem *reg_base; 690 690 struct ioat_device *device; 691 691 692 692 err = pci_enable_device(pdev);
+2 -2
drivers/dma/ioatdma.h
··· 44 44 45 45 struct ioat_device { 46 46 struct pci_dev *pdev; 47 - void *reg_base; 47 + void __iomem *reg_base; 48 48 struct pci_pool *dma_pool; 49 49 struct pci_pool *completion_pool; 50 50 ··· 73 73 74 74 struct ioat_dma_chan { 75 75 76 - void *reg_base; 76 + void __iomem *reg_base; 77 77 78 78 dma_cookie_t completed_cookie; 79 79 unsigned long last_completion;