aboutsummaryrefslogtreecommitdiff
path: root/arch/riscv64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/riscv64')
-rw-r--r--arch/riscv64/include/csr.h2
-rw-r--r--arch/riscv64/kernel/vmem.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/riscv64/include/csr.h b/arch/riscv64/include/csr.h
index 52db9c1..43c365b 100644
--- a/arch/riscv64/include/csr.h
+++ b/arch/riscv64/include/csr.h
@@ -42,7 +42,7 @@
#define SSTATUS_SPP (1 << 8)
/* directly lifted from Linux:/arch/riscv/include/asm/asm.h:9-13 */
-#ifdef __ASSEMBLY__
+#if defined(__ASSEMBLY__)
#define __ASM_STR(x) x
#else
#define __ASM_STR(x) #x
diff --git a/arch/riscv64/kernel/vmem.c b/arch/riscv64/kernel/vmem.c
index 0424948..9fd42dd 100644
--- a/arch/riscv64/kernel/vmem.c
+++ b/arch/riscv64/kernel/vmem.c
@@ -175,8 +175,8 @@ void populate_root_branch(struct vm_branch *b)
b->leaf[IO_PAGE] = (struct vm_branch *)to_pte(0, flags);
}
-#ifdef DEBUG
-int setup_kernel_io(struct vm_branch *b, vm_t paddr)
+#if defined(DEBUG)
+vm_t setup_kernel_io(struct vm_branch *b, vm_t paddr)
{
/* assume Sv39 for now */
pm_t gigapage = paddr / MM_GPAGE_SIZE;