diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-10 13:00:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-10 13:00:02 +0100 |
| commit | 51e809ee973d95a49753d554753e1c65a507b0b2 (patch) | |
| tree | c3ebca0d1706b73ae11907d2d1e5112250f80cd8 /fs/proc | |
| parent | 472a0079c08c9e92489940d3a1527508a5beeeec (diff) | |
| parent | 42108afdd3ce3010ed1e7ff613cc97d024807e99 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/task_mmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index d35dbe43de5d..c93ebb4a34f7 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1,4 +1,5 @@ #include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/hugetlb.h> #include <linux/huge_mm.h> #include <linux/mount.h> @@ -202,7 +203,7 @@ static void *m_start(struct seq_file *m, loff_t *pos) /* * We remember last_addr rather than next_addr to hit with - * mmap_cache most of the time. We have zero last_addr at + * vmacache most of the time. We have zero last_addr at * the beginning and also after lseek. We will have -1 last_addr * after the end of the vmas. */ |