diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
| commit | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (patch) | |
| tree | c845d5e80991f0eef3a38381036c8261baffb08a /mm/compaction.c | |
| parent | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (diff) | |
| parent | 7b44c3df0b89d05c80e15eb0522a21d033d1314f (diff) | |
Merge branch 'v3.18/topic/KASAN' into linux-linaro-lsk-v3.18lsk-v3.18-16.04
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index b47f08e159d4..81c89c39dcf7 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -16,6 +16,7 @@ #include <linux/sysfs.h> #include <linux/balloon_compaction.h> #include <linux/page-isolation.h> +#include <linux/kasan.h> #include "internal.h" #ifdef CONFIG_COMPACTION @@ -59,6 +60,7 @@ static void map_pages(struct list_head *list) list_for_each_entry(page, list, lru) { arch_alloc_page(page, 0); kernel_map_pages(page, 1, 1); + kasan_alloc_pages(page, 0); } } |