Index: arch/amd64/src/amd64.c
===================================================================
--- arch/amd64/src/amd64.c	(revision 49a39c2c0d1933132d867a05b71cfac2264eab4b)
+++ arch/amd64/src/amd64.c	(revision 37b451f7a8c252d1c0a3c5b78efd144d682378ec)
@@ -46,4 +46,5 @@
 #include <panic.h>
 #include <interrupt.h>
+#include <arch/syscall.h>
 
 /** Disable I/O on non-privileged levels
@@ -100,8 +101,7 @@
 	/* Enable No-execute pages */
 	set_efer_flag(AMD_NXE_FLAG);
-	/* Enable SYSCALL/SYSRET */
-	set_efer_flag(AMD_SCE_FLAG);
 	/* Enable FPU */
 	cpu_setup_fpu();
+
 	/* Initialize segmentation */
 	pm_init();
@@ -113,5 +113,4 @@
 	/* Disable alignment check */
 	clean_AM_flag();
-	
 
 	if (config.cpu_active == 1) {
@@ -133,4 +132,7 @@
 		ega_init();	/* video */
 	}
+	/* Setup fast SYSCALL/SYSRET */
+	syscall_setup_cpu();
+
 }