diff options
| author | Xiaotian Feng <xtfeng@gmail.com> | 2012-06-05 23:00:31 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 13:58:38 +0400 |
| commit | aff5a62d52ff03956ff6992b9fe4b561fd855804 (patch) | |
| tree | 3ee9fbb561ca19adf2b5a8583050566bc356ab0e /arch | |
| parent | 1a87fc1ec7b05b9bc60df9dc52297d4c225d7f1a (diff) | |
| download | linux-aff5a62d52ff03956ff6992b9fe4b561fd855804.tar.xz | |
x86/gart: Fix kmemleak warning
aperture_64.c now is using memblock, the previous
kmemleak_ignore() for alloc_bootmem() should be removed then.
Otherwise, with kmemleak enabled, kernel will throw warnings
like:
[ 0.000000] kmemleak: Trying to color unknown object at 0xffff8800c4000000 as Black
[ 0.000000] Pid: 0, comm: swapper/0 Not tainted 3.5.0-rc1-next-20120605+ #130
[ 0.000000] Call Trace:
[ 0.000000] [<ffffffff811b27e6>] paint_ptr+0x66/0xc0
[ 0.000000] [<ffffffff816b90fb>] kmemleak_ignore+0x2b/0x60
[ 0.000000] [<ffffffff81ef7bc0>] kmemleak_init+0x217/0x2c1
[ 0.000000] [<ffffffff81ed2b97>] start_kernel+0x32d/0x3eb
[ 0.000000] [<ffffffff81ed25e4>] ? repair_env_string+0x5a/0x5a
[ 0.000000] [<ffffffff81ed2356>] x86_64_start_reservations+0x131/0x135
[ 0.000000] [<ffffffff81ed2120>] ? early_idt_handlers+0x120/0x120
[ 0.000000] [<ffffffff81ed245c>] x86_64_start_kernel+0x102/0x111
[ 0.000000] kmemleak: Early log backtrace:
[ 0.000000] [<ffffffff816b911b>] kmemleak_ignore+0x4b/0x60
[ 0.000000] [<ffffffff81ee6a38>] gart_iommu_hole_init+0x3e7/0x547
[ 0.000000] [<ffffffff81edb20b>] pci_iommu_alloc+0x44/0x6f
[ 0.000000] [<ffffffff81ee81ad>] mem_init+0x19/0xec
[ 0.000000] [<ffffffff81ed2a54>] start_kernel+0x1ea/0x3eb
[ 0.000000] [<ffffffff81ed2356>] x86_64_start_reservations+0x131/0x135
[ 0.000000] [<ffffffff81ed245c>] x86_64_start_kernel+0x102/0x111
[ 0.000000] [<ffffffffffffffff>] 0xffffffffffffffff
Signed-off-by: Xiaotian Feng <dannyfeng@tencent.com>
Cc: Xiaotian Feng <xtfeng@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1338922831-2847-1-git-send-email-xtfeng@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/aperture_64.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index 6e76c191a835..d5fd66f0d4cd 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c @@ -20,7 +20,6 @@ #include <linux/bitops.h> #include <linux/ioport.h> #include <linux/suspend.h> -#include <linux/kmemleak.h> #include <asm/e820.h> #include <asm/io.h> #include <asm/iommu.h> @@ -95,11 +94,6 @@ static u32 __init allocate_aperture(void) return 0; } memblock_reserve(addr, aper_size); - /* - * Kmemleak should not scan this block as it may not be mapped via the - * kernel direct mapping. - */ - kmemleak_ignore(phys_to_virt(addr)); printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n", aper_size >> 10, addr); insert_aperture_resource((u32)addr, aper_size); |