Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/tprof revert my previous commit.



details:   https://anonhg.NetBSD.org/src/rev/a321861b61c5
branches:  trunk
changeset: 372298:a321861b61c5
user:      ryo <ryo%NetBSD.org@localhost>
date:      Thu Nov 10 07:54:20 2022 +0000

description:
revert my previous commit.

since armv8_pmu_init is only called when it is reliably worked by ACPI or fdt,
there is no need for dynamic checks.

pointed out by jmcneill@, thanks

diffstat:

 sys/dev/tprof/tprof_armv8.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r a015c8b04c6d -r a321861b61c5 sys/dev/tprof/tprof_armv8.c
--- a/sys/dev/tprof/tprof_armv8.c       Thu Nov 10 06:13:58 2022 +0000
+++ b/sys/dev/tprof/tprof_armv8.c       Thu Nov 10 07:54:20 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_armv8.c,v 1.15 2022/11/09 19:06:46 ryo Exp $ */
+/* $NetBSD: tprof_armv8.c,v 1.16 2022/11/10 07:54:20 ryo Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof_armv8.c,v 1.15 2022/11/09 19:06:46 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof_armv8.c,v 1.16 2022/11/10 07:54:20 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -233,8 +233,7 @@
 int
 armv8_pmu_init(void)
 {
-       if (!armv8_pmu_detect())
-               return ENOTSUP;
+       KASSERT(armv8_pmu_detect());
 
        uint64_t xc = xc_broadcast(0, armv8_pmu_init_cpu, NULL, NULL);
        xc_wait(xc);



Home | Main Index | Thread Index | Old Index