Merge remote-tracking branch 'origin/clustered' into aks_dev_clus
authorAkshay Giridhar <akshay87@vt.edu>
Tue, 24 Jun 2014 21:39:59 +0000 (17:39 -0400)
committerAkshay Giridhar <akshay87@vt.edu>
Tue, 24 Jun 2014 21:39:59 +0000 (17:39 -0400)
Conflicts:
fs/exec.c
include/linux/popcorn.h
include/linux/process_server.h
kernel/futex.c
kernel/kinit.c
kernel/process_server.c
kernel/sched.c
pcnmsg/pcn_kmsg.c

1  2 
fs/exec.c
include/linux/pcn_kmsg.h
include/linux/process_server.h
ipc/Makefile
kernel/kmod.c
kernel/process_server.c
pcnmsg/pcn_kmsg.c

diff --cc fs/exec.c
Simple merge
Simple merge
Simple merge
diff --cc ipc/Makefile
@@@ -3,10 -3,11 +3,11 @@@
  #
  
  obj-$(CONFIG_SYSVIPC_COMPAT) += compat.o
 -obj-$(CONFIG_SYSVIPC) += util.o msgutil.o msg.o sem.o shm.o ipcns_notifier.o syscall.o
 +obj-$(CONFIG_SYSVIPC) += util.o msgutil.o msg.o sem.o shm.o ipcns_notifier.o syscall.o sem_remote.o shm_remote.o
  obj-$(CONFIG_SYSVIPC_SYSCTL) += ipc_sysctl.o
  obj_mq-$(CONFIG_COMPAT) += compat_mq.o
- obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y) bbuffer.o mbuffer.o mcomm.o
+ #obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y) bbuffer.o mbuffer.o mcomm.o
+ obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y)
  obj-$(CONFIG_IPC_NS) += namespace.o
  obj-$(CONFIG_POSIX_MQUEUE_SYSCTL) += mq_sysctl.o
  
diff --cc kernel/kmod.c
@@@ -199,11 -199,9 +199,12 @@@ static int ____call_usermodehelper(voi
          //current->represents_remote = 0;
          memcpy(&current->remote_regs, &sub_info->remote_regs, sizeof(struct pt_regs) );
  
 +        /*mklinux_akshay*/
 +        current->origin_pid =sub_info->origin_pid;
 +
          // Notify of PID/PID pairing.
-         process_server_notify_delegated_subprocess_starting(current->pid,sub_info->remote_pid,sub_info->remote_cpu);
+         process_server_notify_delegated_subprocess_starting(
+               current->pid,sub_info->remote_pid,sub_info->remote_cpu);
      } 
  
        retval = kernel_execve(sub_info->path,
@@@ -250,17 -241,8 +248,11 @@@ static void perf_init(void) 
  #define PERF_INIT() 
  #define PERF_MEASURE_START(x) -1
  #define PERF_MEASURE_STOP(x, y, z)
 -#endif /* !CONFIG_POPCORN_PERF */
 +#endif
 +
 +
 +static DECLARE_WAIT_QUEUE_HEAD( countq);
  
- /**
-  * Constants
-  */
- #define RETURN_DISPOSITION_EXIT 0
- #define RETURN_DISPOSITION_MIGRATE 1
  /**
   * Library
   */
Simple merge