diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 14:33:41 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 14:33:41 +0000 |
commit | 828d9982ebf994a20293b79e9773039f1d74d44f (patch) | |
tree | cd0d489f392c63e73e2d938ef99eecc342a21e04 /include/linux/resource.h | |
parent | ebfa200c1c2d8a0a0634ebd7a24123f9a0404a5c (diff) | |
parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'include/linux/resource.h')
-rw-r--r-- | include/linux/resource.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/resource.h b/include/linux/resource.h index aaa423a6f3d..40fc7e62608 100644 --- a/include/linux/resource.h +++ b/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 |