From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 11 Feb 2009 17:01:23 +0000 (+0100)
Subject: Fix memlockall patch
X-Git-Tag: 1.24-pre1~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96759116e2f901a2b4060a940ec2ea5d710aa7e5;p=thirdparty%2Fchrony.git

Fix memlockall patch
---

diff --git a/main.c b/main.c
index 65942c13..bd406522 100644
--- a/main.c
+++ b/main.c
@@ -309,6 +309,14 @@ int main
   CAM_Initialise();
   RTC_Initialise();
 
+  if (SchedPriority > 0) {
+    SYS_SetScheduler(SchedPriority);
+  }
+
+  if (LockAll == 1 ) {
+    SYS_MemLockAll(LockAll);
+  }
+
   if (user)
     SYS_DropRoot(user);
 
@@ -339,18 +347,6 @@ int main
   signal(SIGHUP, signal_cleanup);
 #endif /* WINNT */
 
-#if defined(HAVE_SCHED_SETSCHEDULER)
-  if (SchedPriority > 0) {
-    SYS_SetScheduler(SchedPriority);
-  }
-#endif
-
-#if defined(HAVE_MLOCKALL)
-  if (LockAll == 1 ) {
-    SYS_MemLockAll(LockAll);
-  }
-#endif
-
   /* The program normally runs under control of the main loop in
      the scheduler. */
   SCH_MainLoop();
diff --git a/sys_linux.h b/sys_linux.h
index d4bc2f6f..5cde036b 100644
--- a/sys_linux.h
+++ b/sys_linux.h
@@ -41,6 +41,6 @@ extern void SYS_Linux_DropRoot(char *user);
 
 extern void SYS_Linux_MemLockAll(int LockAll);
 
-extern void SYS_linux_SetScheduler(int SchedPriority);
+extern void SYS_Linux_SetScheduler(int SchedPriority);
 
 #endif  /* GOT_SYS_LINUX_H */