diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-11-10 10:04:34 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-11-10 10:04:34 +0000 |
| commit | 5e1bb8ad8f057ea3740e5a304d2b7f9abdba0df7 (patch) | |
| tree | 594dad68c690bd0a0ee56f91656fdd81b5eeaa35 /sys/dev | |
| parent | 691328bd8f78bbebf12daaa96e24b5824828367c (diff) | |
all archs now have ci_idepth, remove ifdefs
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/kcov.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/include/linux/preempt.h | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/kcov.c b/sys/dev/kcov.c index f572134bbf3..17574fa1e50 100644 --- a/sys/dev/kcov.c +++ b/sys/dev/kcov.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kcov.c,v 1.49 2023/07/29 06:52:50 anton Exp $ */ +/* $OpenBSD: kcov.c,v 1.50 2024/11/10 10:04:33 jsg Exp $ */ /* * Copyright (c) 2018 Anton Lindqvist <anton@openbsd.org> @@ -132,12 +132,7 @@ struct pool kr_pool; static inline int inintr(struct cpu_info *ci) { -#if defined(__amd64__) || defined(__arm__) || defined(__arm64__) || \ - defined(__i386__) return (ci->ci_idepth > 0); -#else - return (0); -#endif } /* diff --git a/sys/dev/pci/drm/include/linux/preempt.h b/sys/dev/pci/drm/include/linux/preempt.h index 361befa92c3..32bf1168d15 100644 --- a/sys/dev/pci/drm/include/linux/preempt.h +++ b/sys/dev/pci/drm/include/linux/preempt.h @@ -29,12 +29,7 @@ migrate_disable(void) static inline bool in_irq(void) { -#if defined(__amd64__) || defined(__arm__) || defined(__arm64__) || \ - defined(__i386__) || defined(__powerpc64__) || defined(__riscv64__) return (curcpu()->ci_idepth > 0); -#else - return false; -#endif } static inline bool |