kmemleak: Remove alloc_bootmem annotations introduced in the past

kmemleak_alloc() calls were added in some places where alloc_bootmem was
called. Since now kmemleak tracks bootmem allocations, these explicit
calls should be run.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>

+3 -18
-7
kernel/pid.c
··· 36 36 #include <linux/pid_namespace.h> 37 37 #include <linux/init_task.h> 38 38 #include <linux/syscalls.h> 39 - #include <linux/kmemleak.h> 40 39 41 40 #define pid_hashfn(nr, ns) \ 42 41 hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) ··· 512 513 pid_hash = alloc_bootmem(pidhash_size * sizeof(*(pid_hash))); 513 514 if (!pid_hash) 514 515 panic("Could not alloc pidhash!\n"); 515 - /* 516 - * pid_hash contains references to allocated struct pid objects and it 517 - * must be scanned by kmemleak to avoid false positives. 518 - */ 519 - kmemleak_alloc(pid_hash, pidhash_size * sizeof(*(pid_hash)), 0, 520 - GFP_KERNEL); 521 516 for (i = 0; i < pidhash_size; i++) 522 517 INIT_HLIST_HEAD(&pid_hash[i]); 523 518 }
+3 -11
mm/page_alloc.c
··· 4745 4745 * some pages at the end of hash table which 4746 4746 * alloc_pages_exact() automatically does 4747 4747 */ 4748 - if (get_order(size) < MAX_ORDER) 4748 + if (get_order(size) < MAX_ORDER) { 4749 4749 table = alloc_pages_exact(size, GFP_ATOMIC); 4750 + kmemleak_alloc(table, size, 1, GFP_ATOMIC); 4751 + } 4750 4752 } 4751 4753 } while (!table && size > PAGE_SIZE && --log2qty); 4752 4754 ··· 4765 4763 *_hash_shift = log2qty; 4766 4764 if (_hash_mask) 4767 4765 *_hash_mask = (1 << log2qty) - 1; 4768 - 4769 - /* 4770 - * If hashdist is set, the table allocation is done with __vmalloc() 4771 - * which invokes the kmemleak_alloc() callback. This function may also 4772 - * be called before the slab and kmemleak are initialised when 4773 - * kmemleak simply buffers the request to be executed later 4774 - * (GFP_ATOMIC flag ignored in this case). 4775 - */ 4776 - if (!hashdist) 4777 - kmemleak_alloc(table, size, 1, GFP_ATOMIC); 4778 4766 4779 4767 return table; 4780 4768 }