diff --git a/[refs] b/[refs] index d41af574eaba..d127055018f4 100644 --- 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 index aaa423a6f3d9..40fc7e626082 100644 --- 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