diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-11 15:38:12 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-11 15:38:12 +1000 |
commit | 5b97259220cae53b174817aab6ab1ff1b616aaf3 (patch) | |
tree | 69cc121a6a933518bb8c65ad96828d4e1f8778dc /arch/powerpc/sysdev | |
parent | cd1154770ba984f4c766cac5ea42c38880080b1d (diff) | |
parent | f56029410a13cae3652d1f34788045c40a13ffc7 (diff) | |
download | op-kernel-dev-5b97259220cae53b174817aab6ab1ff1b616aaf3.zip op-kernel-dev-5b97259220cae53b174817aab6ab1ff1b616aaf3.tar.gz |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/sysdev')
-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 62c47bb..9e5353f 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); } |