evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mm: Inform KASAN when allocating pages during isolation"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-01 23:47:39 -08:00 • committed by Gerrit - the friendly Code Review server
commit daa2c4f942
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mm/page_isolation.c
View file

@ -7,6 +7,7 @@
#include <linux/pageblock-flags.h> #include <linux/pageblock-flags.h>
#include <linux/memory.h> #include <linux/memory.h>
#include <linux/hugetlb.h> #include <linux/hugetlb.h>
#include <linux/kasan.h>
#include "internal.h" #include "internal.h"
static int set_migratetype_isolate(struct page *page, static int set_migratetype_isolate(struct page *page,
@ -105,6 +106,8 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
if (pfn_valid_within(page_to_pfn(buddy)) && if (pfn_valid_within(page_to_pfn(buddy)) &&
!is_migrate_isolate_page(buddy)) { !is_migrate_isolate_page(buddy)) {
__isolate_free_page(page, order); __isolate_free_page(page, order);
kasan_alloc_pages(page, order);
arch_alloc_page(page, order);
kernel_map_pages(page, (1 << order), 1); kernel_map_pages(page, (1 << order), 1);
set_page_refcounted(page); set_page_refcounted(page);
isolated_page = page; isolated_page = page;