diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-28 22:13:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-28 22:13:59 +0800 |
| commit | d87abdcbf8871b5ee58083b3bdf216ba406224b9 (patch) | |
| tree | 5a25ee77e6be9107364139f02025ff6d0e50ab98 /include/linux/mm.h | |
| parent | 428ee0d0d38f2cf5b1c4d584f7b2eee76d7a992e (diff) | |
| parent | 89912966d1c4cf3c48f632fdc571232b5b0bdd63 (diff) | |
Merge branch 'lsk/kdump/for-v4.4' into linux-linaro-lsk-v4.4
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index f0ffa01c90d9..b93d147439f9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2148,14 +2148,18 @@ kernel_map_pages(struct page *page, int numpages, int enable) } #ifdef CONFIG_HIBERNATION extern bool kernel_page_present(struct page *page); -#endif /* CONFIG_HIBERNATION */ -#else +#endif /* CONFIG_HIBERNATION */ +#else /* CONFIG_DEBUG_PAGEALLOC */ static inline void kernel_map_pages(struct page *page, int numpages, int enable) {} #ifdef CONFIG_HIBERNATION static inline bool kernel_page_present(struct page *page) { return true; } -#endif /* CONFIG_HIBERNATION */ -#endif +#endif /* CONFIG_HIBERNATION */ +static inline bool debug_pagealloc_enabled(void) +{ + return false; +} +#endif /* CONFIG_DEBUG_PAGEALLOC */ #ifdef __HAVE_ARCH_GATE_AREA extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm); |