From 8e29c382bac5412dabc55933e4078ee309df5b8e Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Thu, 12 Aug 2021 03:42:53 -0700
Subject: Fix build break from recent merge conflict

Resolves #249
---
 machine/minit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machine/minit.c b/machine/minit.c
index d35f9df..16cd912 100644
--- a/machine/minit.c
+++ b/machine/minit.c
@@ -243,7 +243,7 @@ void enter_supervisor_mode(void (*fn)(uintptr_t), uintptr_t arg0, uintptr_t arg1
   write_csr(mstatus, mstatus);
   write_csr(mscratch, MACHINE_STACK_TOP() - MENTRY_FRAME_SIZE);
 #ifndef __riscv_flen
-  uintptr_t *p_fcsr = MACHINE_STACK_TOP() - MENTRY_FRAME_SIZE; // the x0's save slot
+  uintptr_t *p_fcsr = (uintptr_t*)MACHINE_STACK_TOP() - MENTRY_FRAME_SIZE; // the x0's save slot
   *p_fcsr = 0;
 #endif
   write_csr(mepc, fn);
-- 
cgit v1.1