diff options
Diffstat (limited to 'mm/mmap.c')
-rw-r--r-- | mm/mmap.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -2517,9 +2517,8 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, | |||
2517 | unsigned long ret = -EINVAL; | 2517 | unsigned long ret = -EINVAL; |
2518 | struct file *file; | 2518 | struct file *file; |
2519 | 2519 | ||
2520 | pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. " | 2520 | pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n", |
2521 | "See Documentation/vm/remap_file_pages.txt.\n", | 2521 | current->comm, current->pid); |
2522 | current->comm, current->pid); | ||
2523 | 2522 | ||
2524 | if (prot) | 2523 | if (prot) |
2525 | return ret; | 2524 | return ret; |
@@ -2885,8 +2884,7 @@ bool may_expand_vm(struct mm_struct *mm, vm_flags_t flags, unsigned long npages) | |||
2885 | if (is_data_mapping(flags) && | 2884 | if (is_data_mapping(flags) && |
2886 | mm->data_vm + npages > rlimit(RLIMIT_DATA) >> PAGE_SHIFT) { | 2885 | mm->data_vm + npages > rlimit(RLIMIT_DATA) >> PAGE_SHIFT) { |
2887 | if (ignore_rlimit_data) | 2886 | if (ignore_rlimit_data) |
2888 | pr_warn_once("%s (%d): VmData %lu exceed data ulimit " | 2887 | pr_warn_once("%s (%d): VmData %lu exceed data ulimit %lu. Will be forbidden soon.\n", |
2889 | "%lu. Will be forbidden soon.\n", | ||
2890 | current->comm, current->pid, | 2888 | current->comm, current->pid, |
2891 | (mm->data_vm + npages) << PAGE_SHIFT, | 2889 | (mm->data_vm + npages) << PAGE_SHIFT, |
2892 | rlimit(RLIMIT_DATA)); | 2890 | rlimit(RLIMIT_DATA)); |