Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67bf9025 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "kasan: mm: Remove redundant kasan page alloc and free calls"

parents 1a4990ae 019efb95

mm/compaction.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static void map_pages(struct list_head *list) 
		kasan_alloc_pages(page, 0);

		arch_alloc_page(page, 0);

		kernel_map_pages(page, 1, 1);

		kasan_alloc_pages(page, 0);

	}

}

mm/page_alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -788,7 +788,6 @@ static bool free_pages_prepare(struct page *page, unsigned int order) 


	trace_mm_page_free(page, order);

	kmemcheck_free_shadow(page, order);

	kasan_free_pages(page, order);



	if (PageAnon(page))

		page->mapping = NULL;
@@ -978,7 +977,6 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags) 
	kasan_alloc_pages(page, order);

	arch_alloc_page(page, order);

	kernel_map_pages(page, 1 << order, 1);

	kasan_alloc_pages(page, order);



	if (gfp_flags & __GFP_ZERO)

		prep_zero_page(page, order, gfp_flags);