diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-03-02 12:58:58 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-02 12:58:58 +0900 |
| commit | 79e24da00b1137031245f3341828e4215b1b5b59 (patch) | |
| tree | fbb921353aa48f5b26bc9cff4bfd5848010dae23 /lib/dma-debug.c | |
| parent | ASoC: rsnd: judge work SSI in runtime (diff) | |
| parent | regmap: add regmap_fields_force_xxx() macros (diff) | |
| download | linux-rng-79e24da00b1137031245f3341828e4215b1b5b59.tar.xz linux-rng-79e24da00b1137031245f3341828e4215b1b5b59.zip | |
Merge branch 'topic/update-bits' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-rcar
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 8855f019ebe8..4a1515f4b452 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -1181,7 +1181,7 @@ static inline bool overlap(void *addr, unsigned long len, void *start, void *end static void check_for_illegal_area(struct device *dev, void *addr, unsigned long len) { - if (overlap(addr, len, _text, _etext) || + if (overlap(addr, len, _stext, _etext) || overlap(addr, len, __start_rodata, __end_rodata)) err_printk(dev, NULL, "DMA-API: device driver maps memory from kernel text or rodata [addr=%p] [len=%lu]\n", addr, len); } @@ -1464,7 +1464,7 @@ void debug_dma_alloc_coherent(struct device *dev, size_t size, entry->type = dma_debug_coherent; entry->dev = dev; entry->pfn = page_to_pfn(virt_to_page(virt)); - entry->offset = (size_t) virt & PAGE_MASK; + entry->offset = (size_t) virt & ~PAGE_MASK; entry->size = size; entry->dev_addr = dma_addr; entry->direction = DMA_BIDIRECTIONAL; @@ -1480,7 +1480,7 @@ void debug_dma_free_coherent(struct device *dev, size_t size, .type = dma_debug_coherent, .dev = dev, .pfn = page_to_pfn(virt_to_page(virt)), - .offset = (size_t) virt & PAGE_MASK, + .offset = (size_t) virt & ~PAGE_MASK, .dev_addr = addr, .size = size, .direction = DMA_BIDIRECTIONAL, |