diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-04-30 23:00:39 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-04-30 23:00:39 +0000 |
| commit | 916230d366e2430fd21ec8a94552bd58626d6f62 (patch) | |
| tree | 5bd6740a192a8ad2b95c952797f1f6b8ffe808a7 /sys/arch | |
| parent | 7c2453af427bef541e3e9f9bc0814c8178bbaac8 (diff) | |
make timer/intc cd_name match config
ok kettenis@ mlarkin@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/riscv64/dev/riscv_cpu_intc.c | 2 | ||||
| -rw-r--r-- | sys/arch/riscv64/dev/timer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/riscv64/dev/riscv_cpu_intc.c b/sys/arch/riscv64/dev/riscv_cpu_intc.c index c0d7be67c39..799dc0c5baa 100644 --- a/sys/arch/riscv64/dev/riscv_cpu_intc.c +++ b/sys/arch/riscv64/dev/riscv_cpu_intc.c @@ -55,7 +55,7 @@ struct cfattach intc_ca = { }; struct cfdriver intc_cd = { - NULL, "rv_cpu_intc", DV_DULL + NULL, "intc", DV_DULL }; int diff --git a/sys/arch/riscv64/dev/timer.c b/sys/arch/riscv64/dev/timer.c index 946e28d489b..849b0c91592 100644 --- a/sys/arch/riscv64/dev/timer.c +++ b/sys/arch/riscv64/dev/timer.c @@ -109,7 +109,7 @@ struct cfattach timer_ca = { }; struct cfdriver timer_cd = { - NULL, "riscv_timer", DV_DULL + NULL, "timer", DV_DULL }; static inline uint64_t @@ -274,7 +274,7 @@ riscv_timer_cpu_initclocks() /* configure virtual timer interrupt */ sc->sc_ih = riscv_intc_intr_establish(IRQ_TIMER_SUPERVISOR, 0, - riscv_timer_intr, NULL, "riscv_timer"); + riscv_timer_intr, NULL, "timer"); next = get_cycles() + sc->sc_ticks_per_intr; pc->pc_nexttickevent = pc->pc_nextstatevent = next; |