diff --git a/buildroot b/buildroot
index bc60382..f3d114a 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit bc60382b8ff776bd58dfd4732221e5c927c50c37
+Subproject commit f3d114a1effd8a6ef773bee14fe49ea6d8d7c350
diff --git a/kernel_module/user/m5ops.c b/kernel_module/user/m5ops.c
index 3df1d9f..0d13428 100644
--- a/kernel_module/user/m5ops.c
+++ b/kernel_module/user/m5ops.c
@@ -4,22 +4,22 @@
 
 #define ENABLED 1
 #if defined(__aarch64__)
-static void m5_checkpoint(uint64_t x, uint64_t y)
-{
-	__asm__ __volatile__ (".inst 0xff430110;":: "x0" (x), "x1" (y));
-};
-static void m5_dump_stats(uint64_t x, uint64_t y)
-{
-	__asm__ __volatile__ (".inst 0xff410110;":: "x0" (x), "x1" (y));
-};
+/*static void m5_checkpoint(uint64_t x, uint64_t y)*/
+/*{*/
+	/*__asm__ __volatile__ ("mov x0, %0; mov x1, %1; .inst 0xff430110;":: "m" (x), "m" (y));*/
+/*};*/
+/*static void m5_dump_stats(uint64_t x, uint64_t y)*/
+/*{*/
+	/*__asm__ __volatile__ ("mov %0, x0; mov %1, x1; .inst 0xff410110;":: "m" (x), "m" (y));*/
+/*};*/
 static void m5_exit(uint64_t x)
 {
-	__asm__ __volatile__ (".inst 0xff210110;":: "x0" (x));
-};
-static void m5_reset_stats(uint64_t x, uint64_t y)
-{
-	__asm__ __volatile__ (".inst 0xff400110;":: "x0" (x), "x1" (y));
+	__asm__ __volatile__ ("mov x0, %0; .inst 0xff210110;":: "m" (x));
 };
+/*static void m5_reset_stats(uint64_t x, uint64_t y)*/
+/*{*/
+	/*__asm__ __volatile__ ("mov %0, x0; mov %1, x1; .inst 0xff400110;":: "m" (x), "m" (y));*/
+/*};*/
 #else
 #undef ENABLED
 #define ENABLED 0
@@ -42,18 +42,18 @@ void
 	}
 	switch (action)
 	{
-        case 'c':
-            m5_checkpoint(0, 0);
-	        break;
-        case 'd':
-            m5_dump_stats(0, 0);
-	        break;
-        case 'e':
-            m5_exit(0);
-	        break;
-        case 'r':
-            m5_reset_stats(0, 0);
-	        break;
+		/*case 'c':*/
+		/*m5_checkpoint(0, 0);*/
+		/*break;*/
+		/*case 'd':*/
+		/*m5_dump_stats(0, 0);*/
+		/*break;*/
+		case 'e':
+			m5_exit(0);
+			break;
+			/*case 'r':*/
+			/*m5_reset_stats(0, 0);*/
+			/*break;*/
 	}
 #endif
 	return EXIT_SUCCESS;