diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c
index 78b1473f..319c8369 100644
--- a/executer/user/mcexec.c
+++ b/executer/user/mcexec.c
@@ -630,14 +630,6 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
 			pthread_mutex_unlock(lock);
 			return w.sr.args[0];
 
-		case __NR_getcwd: {
-            // note that return type is different between glibc-getcwd and sys_getcwd
-			char* c = getcwd((void *)dma_buf, w.sr.args[1]); 
-            ret = (c == 0) ? -errno : strnlen((const char*)dma_buf, w.sr.args[1]);
-            __dprintf("getcwd result: %s\n", dma_buf);
-			do_syscall_return(fd, cpu, ret, 1, (unsigned long)dma_buf, w.sr.args[0], c == 0 ? 0 : ret + 1);
-            break; }
-
             // see linux-2.6.34.13/fs/open.c
 		case __NR_access: {
 			dma_buf[256] = 0;
diff --git a/kernel/syscall.c b/kernel/syscall.c
index a95a0a4d..f1808cfb 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -450,16 +450,6 @@ SYSCALL_DECLARE(getpid)
 	return cpu_local_var(current)->pid;
 }
 
-// asmlinkage long sys_getcwd(char __user *buf, unsigned long size);
-SYSCALL_DECLARE(getcwd)
-{
-    dkprintf("getcwd\n");
-    SYSCALL_HEADER;
-	SYSCALL_ARGS_2(MO, D);
-	SYSCALL_FOOTER;
-
-}
-
 SYSCALL_DECLARE(access)
 {
     dkprintf("access: %s\n", (char*)ihk_mc_syscall_arg0(ctx));
@@ -957,7 +947,6 @@ static long (*syscall_table[])(int, ihk_mc_user_context_t *) = {
 	[39] = sys_getpid,
 	[56] = sys_clone,
 	[60] = sys_exit,
-	[79] = sys_getcwd,
     [89] = sys_readlink,
 	[96] = sys_gettimeofday,
 	[97]  = sys_getrlimit,