From: bluhm Date: Tue, 21 Nov 2023 14:00:13 +0000 (+0000) Subject: Fix kernel build without option PTRACE, but with dt(4). X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=98b1b78aea1b08336e2be5d497029949269a536b;p=openbsd Fix kernel build without option PTRACE, but with dt(4). Since revision 1.26 dt_ioctl_get_auxbase() is calling process_domem(). Build the latter function into kernel if pseudo device dt is enabled. from Matthias Pitzl; OK claudio@ --- diff --git a/sys/conf/files b/sys/conf/files index 2a05c7cd024..57a6f6a9bce 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.725 2023/08/07 01:59:38 dlg Exp $ +# $OpenBSD: files,v 1.726 2023/11/21 14:00:13 bluhm Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -752,7 +752,7 @@ file kern/subr_xxx.c file kern/sys_futex.c file kern/sys_generic.c file kern/sys_pipe.c -file kern/sys_process.c ptrace +file kern/sys_process.c ptrace | dt file kern/sys_socket.c file kern/syscalls.c syscall_debug file kern/sysv_ipc.c sysvshm | sysvsem | sysvmsg diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 9533db17572..9ca68a91089 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_process.c,v 1.94 2023/06/10 19:30:48 kettenis Exp $ */ +/* $OpenBSD: sys_process.c,v 1.95 2023/11/21 14:00:13 bluhm Exp $ */ /* $NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $ */ /*- @@ -818,6 +818,7 @@ process_checktracestate(struct process *curpr, struct process *tr, return 0; } +#endif /* PTRACE */ /* * Check if a process is allowed to fiddle with the memory of another. @@ -886,4 +887,3 @@ process_domem(struct proc *curp, struct process *tr, struct uio *uio, int req) return error; } -#endif