---

yaml --- r: 118019 b: refs/heads/master c: 0833422 h: refs/heads/master i: 118017: fad4e28 118015: c3f2c6a v: v3
git-mirror · Oct 30, 2008 · e6b43ab · e6b43ab
1 parent 161de4d
commit e6b43ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e946217e4fdaa67681bbabfa8e6b18641921f750
+refs/heads/master: 0833422274ff00729a603b020fac297e69a03e40
diff --git a/trunk/include/linux/resource.h b/trunk/include/linux/resource.h
@@ -59,10 +59,10 @@ struct rlimit {
 #define _STK_LIM	(8*1024*1024)
 
 /*
- * GPG wants 32kB of mlocked memory, to make sure pass phrases
+ * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
  * and other sensitive information are never written to disk.
  */
-#define MLOCK_LIMIT	(8 * PAGE_SIZE)
+#define MLOCK_LIMIT	((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
 
 /*
  * Due to binary compatibility, the actual resource numbers