Index: kernel/arch/riscv64/include/arch/asm.h
===================================================================
--- kernel/arch/riscv64/include/arch/asm.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
+++ kernel/arch/riscv64/include/arch/asm.h	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -47,6 +47,6 @@
 
 	asm volatile (
-		"csrrsi %[ipl], sstatus, " STRING(SSTATUS_SIE_MASK) "\n"
-		: [ipl] "=r" (ipl)
+	    "csrrsi %[ipl], sstatus, " STRING(SSTATUS_SIE_MASK) "\n"
+	    : [ipl] "=r" (ipl)
 	);
 
@@ -59,6 +59,6 @@
 
 	asm volatile (
-		"csrrci %[ipl], sstatus, " STRING(SSTATUS_SIE_MASK) "\n"
-		: [ipl] "=r" (ipl)
+	    "csrrci %[ipl], sstatus, " STRING(SSTATUS_SIE_MASK) "\n"
+	    : [ipl] "=r" (ipl)
 	);
 
@@ -79,6 +79,6 @@
 
 	asm volatile (
-		"csrr %[ipl], sstatus\n"
-		: [ipl] "=r" (ipl)
+	    "csrr %[ipl], sstatus\n"
+	    : [ipl] "=r" (ipl)
 	);
 
@@ -96,7 +96,7 @@
 
 	asm volatile (
-		"and %[base], sp, %[mask]\n"
-		: [base] "=r" (base)
-		: [mask] "r" (~(STACK_SIZE - 1))
+	    "and %[base], sp, %[mask]\n"
+	    : [base] "=r" (base)
+	    : [mask] "r" (~(STACK_SIZE - 1))
 	);
 
Index: kernel/arch/riscv64/include/arch/atomic.h
===================================================================
--- kernel/arch/riscv64/include/arch/atomic.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
+++ kernel/arch/riscv64/include/arch/atomic.h	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -41,7 +41,7 @@
 {
 	asm volatile (
-		"amoadd.d zero, %[inc], %[addr]\n"
-		: [addr] "+A" (val->count)
-		: [inc] "r" (1)
+	    "amoadd.d zero, %[inc], %[addr]\n"
+	    : [addr] "+A" (val->count)
+	    : [inc] "r" (1)
 	);
 }
@@ -50,7 +50,7 @@
 {
 	asm volatile (
-		"amoadd.d zero, %[inc], %[addr]\n"
-		: [addr] "+A" (val->count)
-		: [inc] "r" (-1)
+	    "amoadd.d zero, %[inc], %[addr]\n"
+	    : [addr] "+A" (val->count)
+	    : [inc] "r" (-1)
 	);
 }
@@ -61,7 +61,7 @@
 
 	asm volatile (
-		"amoadd.d %[orig], %[inc], %[addr]\n"
-		: [orig] "=r" (orig), [addr] "+A" (val->count)
-		: [inc] "r" (1)
+	    "amoadd.d %[orig], %[inc], %[addr]\n"
+	    : [orig] "=r" (orig), [addr] "+A" (val->count)
+	    : [inc] "r" (1)
 	);
 
@@ -74,7 +74,7 @@
 
 	asm volatile (
-		"amoadd.d %[orig], %[inc], %[addr]\n"
-		: [orig] "=r" (orig), [addr] "+A" (val->count)
-		: [inc] "r" (-1)
+	    "amoadd.d %[orig], %[inc], %[addr]\n"
+	    : [orig] "=r" (orig), [addr] "+A" (val->count)
+	    : [inc] "r" (-1)
 	);
 
@@ -87,7 +87,7 @@
 
 	asm volatile (
-		"amoadd.d %[orig], %[inc], %[addr]\n"
-		: [orig] "=r" (orig), [addr] "+A" (val->count)
-		: [inc] "r" (1)
+	    "amoadd.d %[orig], %[inc], %[addr]\n"
+	    : [orig] "=r" (orig), [addr] "+A" (val->count)
+	    : [inc] "r" (1)
 	);
 
@@ -100,7 +100,7 @@
 
 	asm volatile (
-		"amoadd.d %[orig], %[inc], %[addr]\n"
-		: [orig] "=r" (orig), [addr] "+A" (val->count)
-		: [inc] "r" (-1)
+	    "amoadd.d %[orig], %[inc], %[addr]\n"
+	    : [orig] "=r" (orig), [addr] "+A" (val->count)
+	    : [inc] "r" (-1)
 	);
 
Index: kernel/arch/riscv64/include/arch/cycle.h
===================================================================
--- kernel/arch/riscv64/include/arch/cycle.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
+++ kernel/arch/riscv64/include/arch/cycle.h	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -43,6 +43,6 @@
 
 	asm volatile (
-		"rdcycle %[cycle]\n"
-		: [cycle] "=r" (cycle)
+	    "rdcycle %[cycle]\n"
+	    : [cycle] "=r" (cycle)
 	);
 
Index: kernel/arch/riscv64/include/arch/istate.h
===================================================================
--- kernel/arch/riscv64/include/arch/istate.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
+++ kernel/arch/riscv64/include/arch/istate.h	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -39,7 +39,7 @@
 
 #ifdef KERNEL
-	#include <arch/istate_struct.h>
+#include <arch/istate_struct.h>
 #else
-	#include <libarch/istate_struct.h>
+#include <libarch/istate_struct.h>
 #endif
 
Index: kernel/arch/riscv64/include/arch/mm/page.h
===================================================================
--- kernel/arch/riscv64/include/arch/mm/page.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
+++ kernel/arch/riscv64/include/arch/mm/page.h	(revision 2f1c88e88f3d33245f94ca59d2b772d4dd5d1f56)
@@ -42,9 +42,9 @@
 
 #ifndef __ASSEMBLER__
-	#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
-	#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
+#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
+#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
 #else
-	#define KA2PA(x)  ((x) - 0xffff800000000000)
-	#define PA2KA(x)  ((x) + 0xffff800000000000)
+#define KA2PA(x)  ((x) - 0xffff800000000000)
+#define PA2KA(x)  ((x) + 0xffff800000000000)
 #endif