diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
| commit | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (patch) | |
| tree | 40270feadd63149bcd43380cf3fe402a2dcd85ad /include/linux/mm.h | |
| parent | 9b17ba5e21b99587d7c54250059cf10fd51c74f2 (diff) | |
| parent | 6fe78bc1bfcddabbf3d210e18f91da44fa796d8a (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.04
Conflicts:
arch/arm/include/asm/psci.h
mm/memcontrol.c
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index ed271d320a00..e8b103958374 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -589,7 +589,7 @@ static inline compound_page_dtor *get_compound_page_dtor(struct page *page) return page[1].compound_dtor; } -static inline int compound_order(struct page *page) +static inline unsigned int compound_order(struct page *page) { if (!PageHead(page)) return 0; @@ -1775,7 +1775,8 @@ extern void si_meminfo(struct sysinfo * val); extern void si_meminfo_node(struct sysinfo *val, int nid); extern __printf(3, 4) -void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...); +void warn_alloc_failed(gfp_t gfp_mask, unsigned int order, + const char *fmt, ...); extern void setup_per_cpu_pageset(void); |