aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2019-02-06 14:02:22 -0800
committerAnup Patel <anup@brainfault.org>2019-02-08 09:18:46 +0530
commitb4c72deba98b6398a4c44198553093670d226e2d (patch)
tree5a5e770508f6028a6062f0f262888c549d38d3d3
parent93f806af32cc75138cc9afd12ad9931a2954fc8f (diff)
sbi_ecall: Fix logical OR to be bitwise OR
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-rw-r--r--lib/sbi_ecall.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sbi_ecall.c b/lib/sbi_ecall.c
index 7f3986d..42123ba 100644
--- a/lib/sbi_ecall.c
+++ b/lib/sbi_ecall.c
@@ -39,7 +39,7 @@ int sbi_ecall_handler(u32 hartid, ulong mcause,
case SBI_ECALL_SET_TIMER:
#if __riscv_xlen == 32
sbi_timer_event_start(scratch,
- (((u64)regs->a1 << 32) || (u64)regs->a0));
+ (((u64)regs->a1 << 32) | (u64)regs->a0));
#else
sbi_timer_event_start(scratch, (u64)regs->a0);
#endif