diff --git a/aos/linux_code/ipc_lib/shared_mem.c b/aos/linux_code/ipc_lib/shared_mem.c
index e0be160..a3b5ab0 100644
--- a/aos/linux_code/ipc_lib/shared_mem.c
+++ b/aos/linux_code/ipc_lib/shared_mem.c
@@ -16,10 +16,8 @@
 // the path for the shared memory segment. see shm_open(3) for restrictions
 #define AOS_SHM_NAME "/aos_shared_mem"
 // Size of the shared mem segment.
-// Set to the maximum number that worked. Any bigger than this and the kernel
-// thinks you should be able to access all of it but it doesn't work with the
-// ARM kernel Brian was using on 2013-12-20.
-#define SIZEOFSHMSEG (4096 * 25074)
+// This must fit in the tmpfs for /dev/shm/
+#define SIZEOFSHMSEG (4096 * 0x3000)
 
 void init_shared_mem_core(aos_shm_core *shm_core) {
   clock_gettime(CLOCK_REALTIME, &shm_core->identifier);
@@ -47,6 +45,7 @@
   {
     char *shm_name = getenv("AOS_SHM_NAME");
     if (shm_name == NULL) {
+      printf("AOS_SHM_NAME not defined, using " AOS_SHM_NAME "\n");
       global_core->shm_name = AOS_SHM_NAME;
     } else {
       global_core->shm_name = shm_name;
diff --git a/aos/linux_code/logging/linux_logging.cc b/aos/linux_code/logging/linux_logging.cc
index 2bd5bce..f4534ae 100644
--- a/aos/linux_code/logging/linux_logging.cc
+++ b/aos/linux_code/logging/linux_logging.cc
@@ -69,7 +69,7 @@
 void Register() {
   Init();
 
-  queue = RawQueue::Fetch("LoggingQueue", sizeof(LogMessage), 1323, 80000);
+  queue = RawQueue::Fetch("LoggingQueue", sizeof(LogMessage), 1323, 40000);
   if (queue == NULL) {
     Die("logging: couldn't fetch queue\n");
   }