commit 885c6da823a7a3e105f7776c46b5624a4ffec878
author Austin Schuh <austin.linux@gmail.com> Sat Oct 24 14:01:25 2015 -0700
committer Gerrit Code Review <gerrit@robotics.mvla.net> Sat Oct 24 14:01:25 2015 -0700
tree 46e659c275ffb06629f37341864bbbb7174072a3
parent df8e5f5cf4bb7d5c5fc73940594120309450c549
parent 0c715e6744f0287f96a7d8e3253a5446ba705cc4

Merge "Fix time's conditional use of global_core to find its offset"

aos/linux_code/init.cc

diff --git a/aos/linux_code/init.cc b/aos/linux_code/init.cc
index ca14ab3..2e47b16 100644
--- a/aos/linux_code/init.cc
+++ b/aos/linux_code/init.cc
@@ -60,6 +60,10 @@
   WriteCoreDumps();
 }
 
+const char *const kNoRealtimeEnvironmentVariable = "AOS_NO_REALTIME";
+
+}  // namespace
+
 void LockAllMemory() {
   // Allow locking as much as we want into RAM.
   SetSoftRLimit(RLIMIT_MEMLOCK, RLIM_INFINITY, false);
@@ -91,10 +95,6 @@
   free(heap_data);
 }
 
-const char *const kNoRealtimeEnvironmentVariable = "AOS_NO_REALTIME";
-
-}  // namespace
-
 void InitNRT() {
   InitStart();
   aos_core_create_shared_mem(false, false);

aos/linux_code/init.h

diff --git a/aos/linux_code/init.h b/aos/linux_code/init.h
index 2e57166..9b0c3d6 100644
--- a/aos/linux_code/init.h
+++ b/aos/linux_code/init.h
@@ -35,6 +35,8 @@
 // name can have a maximum of 16 characters.
 void SetCurrentThreadName(const ::std::string &name);
 
+void LockAllMemory();
+
 }  // namespace aos
 
 #endif  // AOS_LINUX_CODE_INIT_H_