Index: kernel/arch/ia64/include/arch.h
===================================================================
--- kernel/arch/ia64/include/arch.h	(revision 8b6930d5d4a9a2fdd17c45b45770dd51a1d956a6)
+++ kernel/arch/ia64/include/arch.h	(revision a6d8726cdc2bcda6a70cff109d5ef6a3c639ccc8)
@@ -36,6 +36,4 @@
 #define KERN_ia64_ARCH_H_
 
-#define LOADED_PROG_STACK_PAGES_NO 2
-
 #include <arch/drivers/ski.h>
 
Index: kernel/arch/ia64/include/asm.h
===================================================================
--- kernel/arch/ia64/include/asm.h	(revision 8b6930d5d4a9a2fdd17c45b45770dd51a1d956a6)
+++ kernel/arch/ia64/include/asm.h	(revision a6d8726cdc2bcda6a70cff109d5ef6a3c639ccc8)
@@ -131,5 +131,5 @@
 NO_TRACE static inline uintptr_t get_stack_base(void)
 {
-	uint64_t v;
+	uint64_t value;
 	
 	/*
@@ -152,8 +152,8 @@
 	asm volatile (
 		"mov %[value] = r12"
-		: [value] "=r" (v)
-	);
-	
-	return (v & (~(STACK_SIZE - 1)));
+		: [value] "=r" (value)
+	);
+	
+	return (value & (~(STACK_SIZE - 1)));
 }
 
Index: kernel/arch/ia64/include/mm/as.h
===================================================================
--- kernel/arch/ia64/include/mm/as.h	(revision 8b6930d5d4a9a2fdd17c45b45770dd51a1d956a6)
+++ kernel/arch/ia64/include/mm/as.h	(revision a6d8726cdc2bcda6a70cff109d5ef6a3c639ccc8)
@@ -38,10 +38,10 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0xe000000000000000ULL)
-#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffffffffffffULL)
-#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x0000000000000000ULL)
-#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0xdfffffffffffffffULL)
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xe000000000000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT64_C(0xffffffffffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT64_C(0x0000000000000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT64_C(0xdfffffffffffffff)
 
-#define USTACK_ADDRESS_ARCH  0x0000000ff0000000ULL
+#define USTACK_ADDRESS_ARCH  UINT64_C(0x0000000ff0000000)
 
 typedef struct {
Index: kernel/arch/ia64/include/mm/frame.h
===================================================================
--- kernel/arch/ia64/include/mm/frame.h	(revision 8b6930d5d4a9a2fdd17c45b45770dd51a1d956a6)
+++ kernel/arch/ia64/include/mm/frame.h	(revision a6d8726cdc2bcda6a70cff109d5ef6a3c639ccc8)
@@ -49,6 +49,4 @@
 #define physmem_print()
 
-#define ARCH_STACK_FRAMES TWO_FRAMES
-
 #endif /* __ASM__ */
 #endif /* KERNEL */
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 8b6930d5d4a9a2fdd17c45b45770dd51a1d956a6)
+++ kernel/arch/ia64/src/ia64.c	(revision a6d8726cdc2bcda6a70cff109d5ef6a3c639ccc8)
@@ -250,7 +250,7 @@
 
 	switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
-	    ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE -
+	    ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE -
 	    ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT),
-	    ((uintptr_t) kernel_uarg->uspace_stack) + PAGE_SIZE,
+	    ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE,
 	    (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value);
 
Index: kernel/arch/ia64/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia64/src/proc/scheduler.c	(revision 8b6930d5d4a9a2fdd17c45b45770dd51a1d956a6)
+++ kernel/arch/ia64/src/proc/scheduler.c	(revision a6d8726cdc2bcda6a70cff109d5ef6a3c639ccc8)
@@ -86,6 +86,6 @@
 		"bsw.1\n"
 		:
-		: "r" (&THREAD->kstack[THREAD_STACK_SIZE]),
-		  "r" (&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA])
+		: "r" (&THREAD->kstack[STACK_SIZE]),
+		  "r" (&THREAD->kstack[STACK_SIZE - SP_DELTA])
 		);
 }