sync with OpenBSD -current

sys/conf/GENERIC

@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.295 2024/03/13 14:43:31 bluhm Exp $
+#	$OpenBSD: GENERIC,v 1.296 2024/05/05 07:26:58 jsg Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -29,7 +29,6 @@ option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
 
 option		FFS		# UFS
 option		FFS2		# UFS2
-option		FFS_SOFTUPDATES	# Soft updates
 option		UFS_DIRHASH	# hash large directories
 option		QUOTA		# UFS quotas
 option		EXT2FS		# Second Extended Filesystem

sys/conf/param.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.c,v 1.49 2023/07/04 09:47:51 jsg Exp $	*/
+/*	$OpenBSD: param.c,v 1.50 2024/05/05 06:14:37 jsg Exp $	*/
 /*	$NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $	*/
 
 /*
@@ -39,13 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/socket.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/timeout.h>
-#include <sys/mbuf.h>
-#include <ufs/ufs/quota.h>
 #include <sys/kernel.h>
 #include <sys/utsname.h>
 #ifdef SYSVSHM
@@ -55,9 +48,6 @@
 #ifdef SYSVSEM
 #include <sys/sem.h>
 #endif
-#ifdef SYSVMSG
-#include <sys/msg.h>
-#endif
 
 /*
  * System parameter formulae.

sys/scsi/sd.c

@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.335 2023/11/10 17:43:39 krw Exp $	*/
+/*	$OpenBSD: sd.c,v 1.336 2024/05/04 16:40:38 kn Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -1771,7 +1771,7 @@ validate:
 	}
 
 	if (dp.disksize == 0)
-		goto die;
+		return -1;
 
 	/*
 	 * Restrict secsize values to powers of two between 512 and 64k.