diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-10 13:48:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-10 13:48:19 +1000 |
| commit | 02479717326aac5316d0081f578715d924045fc2 (patch) | |
| tree | ed213857dd2a7384590f66957b8ad083a8864331 /mm/rmap.c | |
| parent | 35956b0206d3d92830dbec7257602e1e4730bf92 (diff) | |
| parent | ea8adcaa2d6a9d8b3f9c19975f4328e1e7b81840 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
fs/namei.c
fs/namespace.c
kernel/fork.c
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 07748e68b729..c21ef372e531 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -42,6 +42,7 @@ * pte map lock */ +#include <linux/sched.h> #include <linux/mm.h> #include <linux/pagemap.h> #include <linux/swap.h> |