[Git][NTPsec/ntpsec][master] Fix botched manual merge. I kept duplicate mlockall.

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
5a6cdcc4 by Hal Murray at 2016-07-17T03:42:08-07:00
Fix botched manual merge.  I kept duplicate mlockall.

- - - - -


1 changed file:

- ntpd/ntpd.c


Changes:

=====================================
ntpd/ntpd.c
=====================================
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -972,22 +972,6 @@ ntpdmain(
 	    exit(0);
 	}
 			
-	/*
-	 * ntpd's working set is never going to be large relative to memory
-	 * availability on modern machines. Do what chrony does and indulge it;
-	 * we get some latency improvement that way.
-	 */
-	{
-	    struct rlimit rlim;
-	    rlim.rlim_max = rlim.rlim_cur = RLIM_INFINITY;
-	    if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0)
-		msyslog(LOG_WARNING, "setrlimit() failed: not locking into RAM");
-	    else if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
-		msyslog(LOG_WARNING, "mlockall() failed: not locking into RAM");
-	    else
-		msyslog(LOG_INFO, "successfully locked into RAM");
-	}
-
 	if (ipv4_works && ipv6_works) {
 		if (opt_ipv4)
 			ipv6_works = false;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/5a6cdcc43b7378f422cee4a7e1148f65ae721703
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160717/b409ffd5/attachment.html>