diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2018-05-26 14:36:36 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2018-05-26 14:36:36 +0000 |
| commit | 9b30c650021956a5639e6f5f8715700973b6b1bb (patch) | |
| tree | f1492212ec3ceaed5f2a794082bf5b0985a8f91e | |
| parent | 5bbbeb415b6fb04f1e9c566426638269289243c7 (diff) | |
Condition the new audio_record_enable pieces on NAUDIO > 0, fixing
kernel builds without audio (for example, ramdisks). ok florian@
| -rw-r--r-- | sys/kern/kern_sysctl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index ee0313f2fbc..25facde0166 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.338 2018/05/26 10:16:14 ratchov Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.339 2018/05/26 14:36:35 sthen Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -120,7 +120,9 @@ extern struct disklist_head disklist; extern fixpt_t ccpu; extern long numvnodes; extern u_int net_livelocks; +#if NAUDIO > 0 extern int audio_record_enable; +#endif int allowkmem; @@ -135,7 +137,9 @@ int sysctl_proc_vmmap(int *, u_int, void *, size_t *, struct proc *); int sysctl_intrcnt(int *, u_int, void *, size_t *); int sysctl_sensors(int *, u_int, void *, size_t *, void *, size_t); int sysctl_cptime2(int *, u_int, void *, size_t *, void *, size_t); +#if NAUDIO > 0 int sysctl_audio(int *, u_int, void *, size_t *, void *, size_t); +#endif void fill_file(struct kinfo_file *, struct file *, struct filedesc *, int, struct vnode *, struct process *, struct proc *, struct socket *, int); @@ -658,9 +662,11 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, case KERN_WITNESSWATCH: return witness_sysctl_watch(oldp, oldlenp, newp, newlen); #endif +#if NAUDIO > 0 case KERN_AUDIO: return (sysctl_audio(name + 1, namelen - 1, oldp, oldlenp, newp, newlen)); +#endif default: return (EOPNOTSUPP); } @@ -2347,7 +2353,6 @@ sysctl_sensors(int *name, u_int namelen, void *oldp, size_t *oldlenp, free(us, M_TEMP, sizeof(*us)); return (ret); } - #endif /* SMALL_KERNEL */ int @@ -2375,6 +2380,7 @@ sysctl_cptime2(int *name, u_int namelen, void *oldp, size_t *oldlenp, sizeof(ci->ci_schedstate.spc_cp_time))); } +#if NAUDIO > 0 int sysctl_audio(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen) @@ -2387,3 +2393,4 @@ sysctl_audio(int *name, u_int namelen, void *oldp, size_t *oldlenp, return (sysctl_int(oldp, oldlenp, newp, newlen, &audio_record_enable)); } +#endif |