git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
kernel core: use helpers for rlimits
[safe/jmp/linux-2.6]
/
kernel
/
perf_event.c
diff --git
a/kernel/perf_event.c
b/kernel/perf_event.c
index
a661e79
..
8e352c7
100644
(file)
--- a/
kernel/perf_event.c
+++ b/
kernel/perf_event.c
@@
-2610,7
+2610,7
@@
static int perf_mmap(struct file *file, struct vm_area_struct *vma)
if (user_locked > user_lock_limit)
extra = user_locked - user_lock_limit;
- lock_limit =
current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur
;
+ lock_limit =
rlimit(RLIMIT_MEMLOCK)
;
lock_limit >>= PAGE_SHIFT;
locked = vma->vm_mm->locked_vm + extra;