diff --git a/kernel/include/process.h b/kernel/include/process.h
index bd10f5dd..a8d8895e 100644
--- a/kernel/include/process.h
+++ b/kernel/include/process.h
@@ -160,7 +160,7 @@
 #endif
 
 #define USER_STACK_NR_PAGES 8192
-#define KERNEL_STACK_NR_PAGES 25
+#define KERNEL_STACK_NR_PAGES 32
 
 #define NOPHYS ((uintptr_t)-1)
 
diff --git a/kernel/syscall.c b/kernel/syscall.c
index a7985728..2d067c67 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -186,7 +186,6 @@ long do_syscall(struct syscall_request *req, int cpu, int pid)
 	unsigned long irqstate;
 	struct thread *thread = cpu_local_var(current);
 	struct process *proc = thread->proc;
-	DECLARE_WAITQ_ENTRY(scd_wq_entry, thread);
 
 	dkprintf("SC(%d)[%3d] sending syscall\n",
 		ihk_mc_get_processor_id(),
@@ -228,7 +227,6 @@ long do_syscall(struct syscall_request *req, int cpu, int pid)
 			int do_schedule = 0;
 			long runq_irqstate;
 			unsigned long flags;
-
 			DECLARE_WAITQ_ENTRY(scd_wq_entry, cpu_local_var(current));
 
 			cpu_pause();