diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:38:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:38:54 +1000 |
| commit | 4b0539027be7ee4572f8e16611c3624a2a4db6a7 (patch) | |
| tree | 49f07417a530f8d71328782fed8cf9fec6053024 /mm/page_alloc.c | |
| parent | b2260517e06ca3c47cc35875c5cbc40e163649cb (diff) | |
| parent | 696ced4fb1d76802f864d8848aa4716633f83c17 (diff) | |
| download | linux-next-4b0539027be7ee4572f8e16611c3624a2a4db6a7.tar.gz | |
Merge remote-tracking branch 'ftrace/for-next'
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0b59d529c7fa..95945fc8e837 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -65,6 +65,7 @@ #include <linux/page_owner.h> #include <linux/kthread.h> #include <linux/memcontrol.h> +#include <linux/ftrace.h> #include <asm/sections.h> #include <asm/tlbflush.h> |