From: Stanislav Vorobiov Date: Mon, 30 Sep 2013 11:40:09 +0000 (+0400) Subject: Revert "YaGL: Set MLOCK limit to infinity. We used to do this via ulimit -SHl unlimit... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4819af4b163d4fc6da304590740ef31be66c9ab2;p=sdk%2Femulator%2Femulator-kernel.git Revert "YaGL: Set MLOCK limit to infinity. We used to do this via ulimit -SHl unlimited, but since nowadays tizen uses systemd it's not possible to set ulimit system wide, so we do it here. This is temporary anyway, YaGL doesn't need to use mlock technically, so this limitation will be removed soon" This reverts commit df489d0d19567678cda269f571a6c91cbbdf3e66. Change-Id: I7be7799a3a001d29cfd08337bcaab5f0f5c1684a --- diff --git a/include/linux/resource.h b/include/linux/resource.h index 5d659a50530b..d01c96c1966e 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h @@ -68,7 +68,7 @@ struct rlimit64 { * GPG2 wants 64kB of mlocked memory, to make sure pass phrases * and other sensitive information are never written to disk. */ -#define MLOCK_LIMIT RLIM_INFINITY/*((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)*/ +#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024) /* * Due to binary compatibility, the actual resource numbers