Merge branch 'develop' into cgroups

diff --cc driver/others/init.c
index 4093776db007b10cf7dcf243121981cd02a11e31,3e6176967712b41a6ea56b7959efb9354d052ead..1f07a24acf2e11f702e523f15e9727224d38cded
--- 1/driver/others/init.c
--- 2/driver/others/init.c
+++ b/driver/others/init.c
@@@ -825,10 -825,7 +825,11 @@@ void gotoblas_affinity_init(void) 
  
    common -> shmid = pshmid;
  
--  if (common -> magic != SH_MAGIC) {
++  if (common -> magic != SH_MAGIC) 
 +    cpu_set_t *cpusetp;
 +    int nums;
 +    int ret;
++
  #ifdef DEBUG
      fprintf(stderr, "Shared Memory Initialization.\n");
  #endif