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

Commit 019efb95 authored by Mohammed Khajapasha's avatar Mohammed Khajapasha
Browse files

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



Remove redundant calls of kasan_alloc_pages()
and kasan_free_pages(). Commit 63d16fa3
("Merge tag 'lsk-v3.18-16.04-android' into 'msm-3.18'")
brought in redundant calls and leading device boot up
failures. So remove the redundant kasan_alloc_pages() and
kasan_free_pages() calls.

Change-Id: I383759466617777f31db44e53cf78cacf7c612b0
Signed-off-by: default avatarMohammed Khajapasha <mkhaja@codeaurora.org>
parent d3e41c96

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);