Skip to content

Commit 08158ad

Browse files
committed
Merge: Revert "mm: kmemleak: alloc gray object for reserved region with direct map"
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6809 JIRA: https://issues.redhat.com/browse/RHEL-75156 Signed-off-by: Luiz Capitulino <luizcap@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Waiman Long <longman@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents 2160b29 + 6e06426 commit 08158ad

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/of/fdt.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/serial_core.h>
2727
#include <linux/sysfs.h>
2828
#include <linux/random.h>
29-
#include <linux/kmemleak.h>
3029

3130
#include <asm/setup.h> /* for COMMAND_LINE_SIZE */
3231
#include <asm/page.h>
@@ -525,12 +524,9 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
525524
size = dt_mem_next_cell(dt_root_size_cells, &prop);
526525

527526
if (size &&
528-
early_init_dt_reserve_memory_arch(base, size, nomap) == 0) {
527+
early_init_dt_reserve_memory_arch(base, size, nomap) == 0)
529528
pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n",
530529
uname, &base, (unsigned long)(size / SZ_1M));
531-
if (!nomap)
532-
kmemleak_alloc_phys(base, size, 0);
533-
}
534530
else
535531
pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n",
536532
uname, &base, (unsigned long)(size / SZ_1M));

0 commit comments

Comments
 (0)