diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap_xip.c | 1 | ||||
-rw-r--r-- | mm/madvise.c | 1 | ||||
-rw-r--r-- | mm/mlock.c | 11 | ||||
-rw-r--r-- | mm/msync.c | 1 | ||||
-rw-r--r-- | mm/vmstat.c | 1 |
5 files changed, 15 insertions, 0 deletions
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 1b49dab9b25d..fa360e566d88 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/uio.h> | 14 | #include <linux/uio.h> |
15 | #include <linux/rmap.h> | 15 | #include <linux/rmap.h> |
16 | #include <linux/sched.h> | ||
16 | #include <asm/tlbflush.h> | 17 | #include <asm/tlbflush.h> |
17 | #include "filemap.h" | 18 | #include "filemap.h" |
18 | 19 | ||
diff --git a/mm/madvise.c b/mm/madvise.c index e75096b5a6d3..60542d006ec1 100644 --- a/mm/madvise.c +++ b/mm/madvise.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/syscalls.h> | 10 | #include <linux/syscalls.h> |
11 | #include <linux/mempolicy.h> | 11 | #include <linux/mempolicy.h> |
12 | #include <linux/hugetlb.h> | 12 | #include <linux/hugetlb.h> |
13 | #include <linux/sched.h> | ||
13 | 14 | ||
14 | /* | 15 | /* |
15 | * Any behaviour which results in changes to the vma->vm_flags needs to | 16 | * Any behaviour which results in changes to the vma->vm_flags needs to |
diff --git a/mm/mlock.c b/mm/mlock.c index 3446b7ef731e..4d3fea267e0d 100644 --- a/mm/mlock.c +++ b/mm/mlock.c | |||
@@ -10,7 +10,18 @@ | |||
10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
11 | #include <linux/mempolicy.h> | 11 | #include <linux/mempolicy.h> |
12 | #include <linux/syscalls.h> | 12 | #include <linux/syscalls.h> |
13 | #include <linux/sched.h> | ||
14 | #include <linux/module.h> | ||
13 | 15 | ||
16 | int can_do_mlock(void) | ||
17 | { | ||
18 | if (capable(CAP_IPC_LOCK)) | ||
19 | return 1; | ||
20 | if (current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur != 0) | ||
21 | return 1; | ||
22 | return 0; | ||
23 | } | ||
24 | EXPORT_SYMBOL(can_do_mlock); | ||
14 | 25 | ||
15 | static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev, | 26 | static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev, |
16 | unsigned long start, unsigned long end, unsigned int newflags) | 27 | unsigned long start, unsigned long end, unsigned int newflags) |
diff --git a/mm/msync.c b/mm/msync.c index 358d73cf7b78..144a7570535d 100644 --- a/mm/msync.c +++ b/mm/msync.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/mman.h> | 12 | #include <linux/mman.h> |
13 | #include <linux/file.h> | 13 | #include <linux/file.h> |
14 | #include <linux/syscalls.h> | 14 | #include <linux/syscalls.h> |
15 | #include <linux/sched.h> | ||
15 | 16 | ||
16 | /* | 17 | /* |
17 | * MS_SYNC syncs the entire file - including mappings. | 18 | * MS_SYNC syncs the entire file - including mappings. |
diff --git a/mm/vmstat.c b/mm/vmstat.c index 8faf27e5aa98..38254297a494 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/cpu.h> | 14 | #include <linux/cpu.h> |
15 | #include <linux/sched.h> | ||
15 | 16 | ||
16 | #ifdef CONFIG_VM_EVENT_COUNTERS | 17 | #ifdef CONFIG_VM_EVENT_COUNTERS |
17 | DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; | 18 | DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; |