diff options
author | Mark Brown <broonie@linaro.org> | 2014-07-08 17:17:56 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-07-08 17:17:56 +0200 |
commit | 8b6c5d8c8b9c8a35b806aaa9dee71d8125e39120 (patch) | |
tree | 6e9c1d8fd14cd5cb71d48d4257e1c1a91fb2a569 /arch/powerpc/sysdev/dart_iommu.c | |
parent | 19dee0d2c9f36a04387d8d0d7e531ab94eef6dc0 (diff) | |
parent | 4c834452aad01531db949414f94f817a86348d59 (diff) |
Merge tag 'v3.16-rc3' into spi-sh-msiof
Linux 3.16-rc3
Diffstat (limited to 'arch/powerpc/sysdev/dart_iommu.c')
-rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 62c47bb76517..9e5353ff6d1b 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c @@ -476,6 +476,11 @@ void __init alloc_dart_table(void) */ dart_tablebase = (unsigned long) __va(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L)); + /* + * The DART space is later unmapped from the kernel linear mapping and + * accessing dart_tablebase during kmemleak scanning will fault. + */ + kmemleak_no_scan((void *)dart_tablebase); printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase); } |