summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2023-11-21 14:00:14 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2023-11-21 14:00:14 +0000
commitfeca15f51e3e21c26071529a88bedfc59f85f902 (patch)
treeb67ade09de18c90aebf5df4e3a6f422ae0a14cfa /sys
parent1115fc02c208a6b1159735d1f9be820d36e4c801 (diff)
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@
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files4
-rw-r--r--sys/kern/sys_process.c4
2 files changed, 4 insertions, 4 deletions
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