summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAndries E. Brouwer <andries.brouwer@cwi.nl>2005-01-03 22:28:02 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-03 22:28:02 -0800
commite83235934b015fa6cd32736bb898cfb58c6d7a1a (patch)
treeeeed6de100165617913c28215954eb2c9a38103e /security
parentd3270a94d8da4d8eecfa54a397d530e36c8df134 (diff)
[PATCH] remove duplicated patch fragment
Acked-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r--security/commoncap.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 1b927c12f56e..0fdbcfd40a98 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -386,10 +386,6 @@ int cap_vm_enough_memory(long pages)
allowed -= allowed / 32;
allowed += total_swap_pages;
- /* Leave the last 3% for root */
- if (current->euid)
- allowed -= allowed / 32;
-
/* Don't let a single process grow too big:
leave 3% of the size of this process for other processes */
allowed -= current->mm->total_vm / 32;