4 files changed, 42 insertions, 42 deletions

diff --git a/src/arch/riscv/include/arch/encoding.h b/src/arch/riscv/include/arch/encoding.h
index d40446b84f..5142a781dd 100644
--- a/src/arch/riscv/include/arch/encoding.h
+++ b/src/arch/riscv/include/arch/encoding.h
@@ -198,35 +198,35 @@
 #ifdef __GNUC__
 
 #define read_csr(reg) ({ unsigned long __tmp; \
-  asm volatile ("csrr %0, " #reg : "=r"(__tmp)); \
-  __tmp; })
+	asm volatile ("csrr %0, " #reg : "=r"(__tmp)); \
+	__tmp; })
 
 #define write_csr(reg, val) ({ \
-  if (__builtin_constant_p(val) && (unsigned long)(val) < 32) \
-    asm volatile ("csrw " #reg ", %0" :: "i"(val)); \
-  else \
-    asm volatile ("csrw " #reg ", %0" :: "r"(val)); })
+	if (__builtin_constant_p(val) && (unsigned long)(val) < 32) \
+		asm volatile ("csrw " #reg ", %0" :: "i"(val)); \
+	else \
+		asm volatile ("csrw " #reg ", %0" :: "r"(val)); })
 
 #define swap_csr(reg, val) ({ unsigned long __tmp; \
-  if (__builtin_constant_p(val) && (unsigned long)(val) < 32) \
-    asm volatile ("csrrw %0, " #reg ", %1" : "=r"(__tmp) : "i"(val)); \
-  else \
-    asm volatile ("csrrw %0, " #reg ", %1" : "=r"(__tmp) : "r"(val)); \
-  __tmp; })
+	if (__builtin_constant_p(val) && (unsigned long)(val) < 32) \
+		asm volatile ("csrrw %0, " #reg ", %1" : "=r"(__tmp) : "i"(val)); \
+	else \
+		asm volatile ("csrrw %0, " #reg ", %1" : "=r"(__tmp) : "r"(val)); \
+	__tmp; })
 
 #define set_csr(reg, bit) ({ unsigned long __tmp; \
-  if (__builtin_constant_p(bit) && (unsigned long)(bit) < 32) \
-    asm volatile ("csrrs %0, " #reg ", %1" : "=r"(__tmp) : "i"(bit)); \
-  else \
-    asm volatile ("csrrs %0, " #reg ", %1" : "=r"(__tmp) : "r"(bit)); \
-  __tmp; })
+	if (__builtin_constant_p(bit) && (unsigned long)(bit) < 32) \
+		asm volatile ("csrrs %0, " #reg ", %1" : "=r"(__tmp) : "i"(bit)); \
+	else \
+		asm volatile ("csrrs %0, " #reg ", %1" : "=r"(__tmp) : "r"(bit)); \
+	__tmp; })
 
 #define clear_csr(reg, bit) ({ unsigned long __tmp; \
-  if (__builtin_constant_p(bit) && (unsigned long)(bit) < 32) \
-    asm volatile ("csrrc %0, " #reg ", %1" : "=r"(__tmp) : "i"(bit)); \
-  else \
-    asm volatile ("csrrc %0, " #reg ", %1" : "=r"(__tmp) : "r"(bit)); \
-  __tmp; })
+	if (__builtin_constant_p(bit) && (unsigned long)(bit) < 32) \
+		asm volatile ("csrrc %0, " #reg ", %1" : "=r"(__tmp) : "i"(bit)); \
+	else \
+		asm volatile ("csrrc %0, " #reg ", %1" : "=r"(__tmp) : "r"(bit)); \
+	__tmp; })
 
 #define rdtime() read_csr(time)
 #define rdcycle() read_csr(cycle)
diff --git a/src/arch/riscv/include/atomic.h b/src/arch/riscv/include/atomic.h
index 639b54a895..bc739fbb71 100644
--- a/src/arch/riscv/include/atomic.h
+++ b/src/arch/riscv/include/atomic.h
@@ -45,23 +45,23 @@ typedef struct { int lock; } spinlock_t;
 # define atomic_cas(ptr, cmp, swp) __sync_val_compare_and_swap(ptr, cmp, swp)
 #else
 # define atomic_add(ptr, inc) ({ \
-  long flags = disable_irqsave(); \
-  typeof(ptr) res = *(volatile typeof(ptr))(ptr); \
-  *(volatile typeof(ptr))(ptr) = res + (inc); \
-  enable_irqrestore(flags); \
-  res; })
+	  long flags = disable_irqsave(); \
+	  typeof(ptr) res = *(volatile typeof(ptr))(ptr); \
+	  *(volatile typeof(ptr))(ptr) = res + (inc); \
+	  enable_irqrestore(flags); \
+	  res; })
 # define atomic_swap(ptr, swp) ({ \
-  long flags = disable_irqsave(); \
-  typeof(*ptr) res = *(volatile typeof(ptr))(ptr); \
-  *(volatile typeof(ptr))(ptr) = (swp); \
-  enable_irqrestore(flags); \
-  res; })
+	  long flags = disable_irqsave(); \
+	  typeof(*ptr) res = *(volatile typeof(ptr))(ptr); \
+	  *(volatile typeof(ptr))(ptr) = (swp); \
+	  enable_irqrestore(flags); \
+	  res; })
 # define atomic_cas(ptr, cmp, swp) ({ \
-  long flags = disable_irqsave(); \
-  typeof(ptr) res = *(volatile typeof(ptr))(ptr); \
-  if (res == (cmp)) *(volatile typeof(ptr))(ptr) = (swp); \
-  enable_irqrestore(flags); \
-  res; })
+	  long flags = disable_irqsave(); \
+	  typeof(ptr) res = *(volatile typeof(ptr))(ptr); \
+	  if (res == (cmp)) *(volatile typeof(ptr))(ptr) = (swp); \
+		  enable_irqrestore(flags); \
+	  res; })
 #endif
 
 #endif
diff --git a/src/arch/riscv/include/mcall.h b/src/arch/riscv/include/mcall.h
index cdd9bd38eb..fe9611ca4c 100644
--- a/src/arch/riscv/include/mcall.h
+++ b/src/arch/riscv/include/mcall.h
@@ -70,9 +70,9 @@ typedef struct {
 } hls_t;
 
 #define MACHINE_STACK_TOP() ({ \
-  /* coverity[uninit_use] : FALSE */ \
-  register uintptr_t sp asm ("sp"); \
-  (void*)((sp + RISCV_PGSIZE) & -RISCV_PGSIZE); })
+	/* coverity[uninit_use] : FALSE */ \
+	register uintptr_t sp asm ("sp"); \
+	(void*)((sp + RISCV_PGSIZE) & -RISCV_PGSIZE); })
 
 // hart-local storage, at top of stack
 #define HLS() ((hls_t*)(MACHINE_STACK_TOP() - HLS_SIZE))
diff --git a/src/arch/riscv/include/vm.h b/src/arch/riscv/include/vm.h
index c3de47aa5c..a65aba9db8 100644
--- a/src/arch/riscv/include/vm.h
+++ b/src/arch/riscv/include/vm.h
@@ -41,9 +41,9 @@
 #define INSERT_FIELD(val, which, fieldval) (((val) & ~(which)) | ((fieldval) * ((which) & ~((which)-1))))
 
 #define supervisor_paddr_valid(start, length) \
-  ((uintptr_t)(start) >= current.first_user_vaddr + current.bias \
-   && (uintptr_t)(start) + (length) < mem_size \
-   && (uintptr_t)(start) + (length) >= (uintptr_t)(start))
+	((uintptr_t)(start) >= current.first_user_vaddr + current.bias \
+	 && (uintptr_t)(start) + (length) < mem_size \
+	 && (uintptr_t)(start) + (length) >= (uintptr_t)(start))
 
 typedef uintptr_t pte_t;
 extern pte_t* root_page_table;