diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-05-29 04:42:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-05-29 04:42:26 +0000 |
| commit | 7306560e7b6cab75131568161d847ba0bcebbeeb (patch) | |
| tree | aff365fd9c4851785ea0abf5f58a3be7aaf230db /sys | |
| parent | fb3a8770b87c531b1cffd1a144a9eacba40dcd9f (diff) | |
dev/rndvar.h no longer has statistical interfaces (removed during various
conversion steps). it only contains kernel prototypes for 4 interfaces,
all of which legitimately belong in sys/systm.h, which are already included
by all enqueue_randomness() users.
Diffstat (limited to 'sys')
60 files changed, 62 insertions, 175 deletions
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c index fba82485d3b..cef7166de15 100644 --- a/sys/arch/alpha/alpha/cpu.c +++ b/sys/arch/alpha/alpha/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.42 2016/10/27 09:46:14 dlg Exp $ */ +/* $OpenBSD: cpu.c,v 1.43 2020/05/29 04:42:23 deraadt Exp $ */ /* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */ /*- @@ -64,7 +64,6 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/user.h> -#include <dev/rndvar.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/amd64/amd64/bios.c b/sys/arch/amd64/amd64/bios.c index f5a3359b9ea..c6c38c89661 100644 --- a/sys/arch/amd64/amd64/bios.c +++ b/sys/arch/amd64/amd64/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.41 2019/10/23 10:14:46 jsg Exp $ */ +/* $OpenBSD: bios.c,v 1.42 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca> * @@ -29,8 +29,6 @@ #include <dev/isa/isareg.h> #include <amd64/include/isa_machdep.h> -#include <dev/rndvar.h> - #include "acpi.h" #include "mpbios.h" #include "pci.h" diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c index 54df945ebd6..e1b4557f450 100644 --- a/sys/arch/amd64/amd64/cpu.c +++ b/sys/arch/amd64/amd64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.148 2020/02/28 05:31:41 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.149 2020/05/29 04:42:23 deraadt Exp $ */ /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -77,7 +77,6 @@ #include <sys/device.h> #include <sys/malloc.h> #include <sys/memrange.h> -#include <dev/rndvar.h> #include <sys/atomic.h> #include <sys/user.h> diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index 7f7035a23f8..e717def502b 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.32 2018/06/05 06:39:10 guenther Exp $ */ +/* $OpenBSD: via.c,v 1.33 2020/05/29 04:42:23 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -35,8 +35,6 @@ #include <machine/cpufunc.h> #include <machine/specialreg.h> -#include <dev/rndvar.h> - void viac3_rnd(void *); diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c index 9b30aa3aca8..a257ca4d66b 100644 --- a/sys/arch/amd64/pci/pchb.c +++ b/sys/arch/amd64/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.44 2020/01/04 01:34:24 jsg Exp $ */ +/* $OpenBSD: pchb.c,v 1.45 2020/05/29 04:42:23 deraadt Exp $ */ /* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -68,8 +68,6 @@ #include <dev/pci/agpvar.h> #include <dev/pci/ppbreg.h> -#include <dev/rndvar.h> - #include <dev/ic/i82802reg.h> #include "agp.h" diff --git a/sys/arch/arm64/dev/apm.c b/sys/arch/arm64/dev/apm.c index 336a33fbfcc..31f22a877a0 100644 --- a/sys/arch/arm64/dev/apm.c +++ b/sys/arch/arm64/dev/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.4 2020/04/07 13:27:50 visa Exp $ */ +/* $OpenBSD: apm.c,v 1.5 2020/05/29 04:42:23 deraadt Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -45,7 +45,6 @@ #include <sys/event.h> #include <sys/reboot.h> #include <sys/hibernate.h> -#include <dev/rndvar.h> #include <machine/conf.h> #include <machine/cpu.h> diff --git a/sys/arch/arm64/dev/smbios.c b/sys/arch/arm64/dev/smbios.c index 0bde7ae2c04..ba47908d3e7 100644 --- a/sys/arch/arm64/dev/smbios.c +++ b/sys/arch/arm64/dev/smbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smbios.c,v 1.4 2019/10/23 10:14:46 jsg Exp $ */ +/* $OpenBSD: smbios.c,v 1.5 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca> * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org> @@ -26,7 +26,6 @@ #include <machine/smbiosvar.h> #include <dev/ofw/fdt.h> -#include <dev/rndvar.h> struct smbios_entry smbios_entry; /* diff --git a/sys/arch/armv7/omap/omrng.c b/sys/arch/armv7/omap/omrng.c index 0beb443e939..99a8c58a54d 100644 --- a/sys/arch/armv7/omap/omrng.c +++ b/sys/arch/armv7/omap/omrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omrng.c,v 1.1 2020/04/05 13:11:13 kettenis Exp $ */ +/* $OpenBSD: omrng.c,v 1.2 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 2018, 2020 Mark Kettenis <kettenis@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/fdt.h> -#include <dev/rndvar.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> diff --git a/sys/arch/hppa/dev/cpu.c b/sys/arch/hppa/dev/cpu.c index 1c5aebfefb4..047d9602cd5 100644 --- a/sys/arch/hppa/dev/cpu.c +++ b/sys/arch/hppa/dev/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.41 2014/01/19 12:45:35 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.42 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 1998-2003 Michael Shalayeff @@ -31,7 +31,6 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/reboot.h> -#include <dev/rndvar.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c index 24c52d0e3f6..033a3d2c356 100644 --- a/sys/arch/hppa/gsc/harmony.c +++ b/sys/arch/hppa/gsc/harmony.c @@ -1,4 +1,4 @@ -/* $OpenBSD: harmony.c,v 1.34 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: harmony.c,v 1.35 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 2003 Jason L. Wright (jason@thought.net) @@ -41,7 +41,6 @@ #include <sys/audioio.h> #include <dev/audio_if.h> -#include <dev/rndvar.h> #include <machine/cpu.h> #include <machine/intr.h> diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c index f9a9648aa9f..3e8c43a416a 100644 --- a/sys/arch/hppa/hppa/pmap.c +++ b/sys/arch/hppa/hppa/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.173 2017/04/30 16:45:45 mpi Exp $ */ +/* $OpenBSD: pmap.c,v 1.174 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -45,8 +45,6 @@ #include <machine/cpufunc.h> #include <machine/iomod.h> -#include <dev/rndvar.h> - #ifdef PMAPDEBUG #define DPRINTF(l,s) do { \ if ((pmapdebug & (l)) == (l)) \ diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index 64f7bbfc7d8..840f1f398b7 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.123 2020/04/07 13:27:50 visa Exp $ */ +/* $OpenBSD: apm.c,v 1.124 2020/05/29 04:42:23 deraadt Exp $ */ /*- * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved. @@ -50,7 +50,6 @@ #include <sys/buf.h> #include <sys/reboot.h> #include <sys/event.h> -#include <dev/rndvar.h> #include <machine/conf.h> #include <machine/cpu.h> diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index 278c5c58e48..7153736f17c 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.124 2019/10/23 10:14:46 jsg Exp $ */ +/* $OpenBSD: bios.c,v 1.125 2020/05/29 04:42:23 deraadt Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -62,8 +62,6 @@ #include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> -#include <dev/rndvar.h> - #include "apm.h" #include "acpi.h" #include "mpbios.h" diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c index 398743e2a80..3d39111b0be 100644 --- a/sys/arch/i386/i386/cpu.c +++ b/sys/arch/i386/i386/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.103 2020/02/28 05:31:42 deraadt Exp $ */ +/* $OpenBSD: cpu.c,v 1.104 2020/05/29 04:42:23 deraadt Exp $ */ /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */ /*- @@ -92,7 +92,6 @@ #include <machine/segments.h> #include <machine/gdt.h> #include <machine/pio.h> -#include <dev/rndvar.h> #if NLAPIC > 0 #include <machine/apicvar.h> diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 5c7fdb19c0b..fe97bd1c047 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.634 2020/05/27 05:08:54 jsg Exp $ */ +/* $OpenBSD: machdep.c,v 1.635 2020/05/29 04:42:23 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -115,7 +115,6 @@ #include <machine/mpbiosvar.h> #endif /* MULTIPROCESSOR */ -#include <dev/rndvar.h> #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #include <dev/ic/i8042reg.h> diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c index 1c1ef7d7ad2..c4bf4cd5952 100644 --- a/sys/arch/i386/i386/via.c +++ b/sys/arch/i386/i386/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.45 2018/06/01 14:23:48 fcambus Exp $ */ +/* $OpenBSD: via.c,v 1.46 2020/05/29 04:42:24 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -35,8 +35,6 @@ #include <machine/cpufunc.h> #include <machine/specialreg.h> -#include <dev/rndvar.h> - void viac3_rnd(void *); diff --git a/sys/arch/i386/pci/glxsb.c b/sys/arch/i386/pci/glxsb.c index a359b99bb6e..ff6047ba78a 100644 --- a/sys/arch/i386/pci/glxsb.c +++ b/sys/arch/i386/pci/glxsb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glxsb.c,v 1.35 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: glxsb.c,v 1.36 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org> @@ -33,7 +33,6 @@ #include <machine/bus.h> #include <machine/cpufunc.h> -#include <dev/rndvar.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c index abb81989871..e0f3a07b5da 100644 --- a/sys/arch/i386/pci/pchb.c +++ b/sys/arch/i386/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.91 2020/01/04 01:34:24 jsg Exp $ */ +/* $OpenBSD: pchb.c,v 1.92 2020/05/29 04:42:24 deraadt Exp $ */ /* $NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $ */ /* @@ -70,8 +70,6 @@ #include <dev/pci/agpvar.h> #include <dev/pci/ppbreg.h> -#include <dev/rndvar.h> - #include <dev/ic/i82802reg.h> #include "agp.h" diff --git a/sys/arch/loongson/dev/apm.c b/sys/arch/loongson/dev/apm.c index a70a00a6567..42b3d7c61ba 100644 --- a/sys/arch/loongson/dev/apm.c +++ b/sys/arch/loongson/dev/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.36 2020/04/07 13:27:50 visa Exp $ */ +/* $OpenBSD: apm.c,v 1.37 2020/05/29 04:42:24 deraadt Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -45,7 +45,6 @@ #include <sys/event.h> #include <sys/reboot.h> #include <sys/hibernate.h> -#include <dev/rndvar.h> #include <machine/autoconf.h> #include <machine/conf.h> diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index 9655d7c627d..c0f11bfcc9b 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.132 2020/05/16 14:44:44 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.133 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -76,7 +76,6 @@ #include <sys/extent.h> #include <sys/core.h> #include <sys/kcore.h> -#include <dev/rndvar.h> #include <machine/asm.h> #include <machine/asm_macro.h> diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c index db486dcc1bf..a3ef26c1c8a 100644 --- a/sys/arch/macppc/macppc/cpu.c +++ b/sys/arch/macppc/macppc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.82 2015/06/04 18:01:44 kettenis Exp $ */ +/* $OpenBSD: cpu.c,v 1.83 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -39,7 +39,6 @@ #include <sys/sysctl.h> #include <sys/task.h> #include <sys/device.h> -#include <dev/rndvar.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index 571a1b83838..7a77ae28de8 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.73 2019/05/06 12:57:56 visa Exp $ */ +/* $OpenBSD: cpu.c,v 1.74 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -32,7 +32,6 @@ #include <sys/atomic.h> #include <sys/device.h> #include <sys/malloc.h> -#include <dev/rndvar.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/octeon/dev/octrng.c b/sys/arch/octeon/dev/octrng.c index 738fea742a6..9ed86f26833 100644 --- a/sys/arch/octeon/dev/octrng.c +++ b/sys/arch/octeon/dev/octrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octrng.c,v 1.8 2020/04/06 00:01:08 pirofti Exp $ */ +/* $OpenBSD: octrng.c,v 1.9 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2013 Paul Irofti <paul@irofti.net> * @@ -20,8 +20,6 @@ #include <sys/device.h> #include <sys/timeout.h> -#include <dev/rndvar.h> - #include <machine/octeonvar.h> #include <machine/octeonreg.h> #include <octeon/dev/iobusvar.h> diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 604cb3be3ab..7b4875ca680 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.121 2020/05/25 13:04:25 visa Exp $ */ +/* $OpenBSD: machdep.c,v 1.122 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -78,7 +78,6 @@ #include <machine/memconf.h> #include <dev/cons.h> -#include <dev/rndvar.h> #include <dev/ofw/fdt.h> #include <octeon/dev/cn30xxcorereg.h> diff --git a/sys/arch/sparc64/dev/vrng.c b/sys/arch/sparc64/dev/vrng.c index bc374a36939..259ded23d16 100644 --- a/sys/arch/sparc64/dev/vrng.c +++ b/sys/arch/sparc64/dev/vrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vrng.c,v 1.5 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: vrng.c,v 1.6 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2008 Mark Kettenis * @@ -30,7 +30,6 @@ #define HSVC_GROUP_RNG 0x104 -#include <dev/rndvar.h> #include <sparc64/dev/vbusvar.h> struct rng_ctl { diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c index 88b75412ded..271823f4d43 100644 --- a/sys/arch/sparc64/sparc64/cpu.c +++ b/sys/arch/sparc64/sparc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.69 2017/12/11 00:15:50 kettenis Exp $ */ +/* $OpenBSD: cpu.c,v 1.70 2020/05/29 04:42:24 deraadt Exp $ */ /* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */ /* @@ -57,7 +57,6 @@ #include <sys/proc.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <dev/rndvar.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index 1bce1e8bc7f..ae4fdc94274 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.194 2020/05/16 14:44:45 kettenis Exp $ */ +/* $OpenBSD: machdep.c,v 1.195 2020/05/29 04:42:24 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -95,7 +95,6 @@ #include <sys/sysctl.h> #include <sys/exec_elf.h> -#include <dev/rndvar.h> #define _SPARC_BUS_DMA_PRIVATE #include <machine/autoconf.h> diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index bc7130561ff..7c103347980 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.385 2020/05/14 13:07:10 kettenis Exp $ */ +/* $OpenBSD: acpi.c,v 1.386 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -42,7 +42,6 @@ #include <machine/cpufunc.h> #include <machine/bus.h> -#include <dev/rndvar.h> #include <dev/pci/pcivar.h> #include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> diff --git a/sys/dev/acpi/acpihve.c b/sys/dev/acpi/acpihve.c index 037e82a35e3..1b89c04e1df 100644 --- a/sys/dev/acpi/acpihve.c +++ b/sys/dev/acpi/acpihve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpihve.c,v 1.2 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: acpihve.c,v 1.3 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2017 Jonathan Gray <jsg@openbsd.org> @@ -22,7 +22,6 @@ #include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> -#include <dev/rndvar.h> int acpihve_match(struct device *, void *, void *); void acpihve_attach(struct device *, struct device *, void *); diff --git a/sys/dev/fdt/amlrng.c b/sys/dev/fdt/amlrng.c index b8218f97309..52f1d2d1bb2 100644 --- a/sys/dev/fdt/amlrng.c +++ b/sys/dev/fdt/amlrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amlrng.c,v 1.1 2019/08/27 22:21:52 kettenis Exp $ */ +/* $OpenBSD: amlrng.c,v 1.2 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/fdt.h> -#include <dev/rndvar.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> diff --git a/sys/dev/fdt/amlsm.c b/sys/dev/fdt/amlsm.c index af237545346..7080978c4dc 100644 --- a/sys/dev/fdt/amlsm.c +++ b/sys/dev/fdt/amlsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amlsm.c,v 1.1 2020/01/14 20:43:20 kettenis Exp $ */ +/* $OpenBSD: amlsm.c,v 1.2 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> * @@ -26,7 +26,6 @@ #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> #include <dev/ofw/ofw_misc.h> -#include <dev/rndvar.h> extern register_t smc_call(register_t, register_t, register_t, register_t); diff --git a/sys/dev/fdt/bcm2711_rng.c b/sys/dev/fdt/bcm2711_rng.c index 72ddb39a4c3..3ee0e213c98 100644 --- a/sys/dev/fdt/bcm2711_rng.c +++ b/sys/dev/fdt/bcm2711_rng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcm2711_rng.c,v 1.1 2020/04/19 16:00:00 kettenis Exp $ */ +/* $OpenBSD: bcm2711_rng.c,v 1.2 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/fdt.h> -#include <dev/rndvar.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> diff --git a/sys/dev/fdt/bcm2835_rng.c b/sys/dev/fdt/bcm2835_rng.c index 91305fe7a53..128e1bf37ca 100644 --- a/sys/dev/fdt/bcm2835_rng.c +++ b/sys/dev/fdt/bcm2835_rng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcm2835_rng.c,v 1.2 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: bcm2835_rng.c,v 1.3 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/fdt.h> -#include <dev/rndvar.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> diff --git a/sys/dev/fdt/mvrng.c b/sys/dev/fdt/mvrng.c index 2169c0a9c23..8f2dcef2e60 100644 --- a/sys/dev/fdt/mvrng.c +++ b/sys/dev/fdt/mvrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mvrng.c,v 1.2 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: mvrng.c,v 1.3 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/fdt.h> -#include <dev/rndvar.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/fdt.h> diff --git a/sys/dev/fdt/rkrng.c b/sys/dev/fdt/rkrng.c index 68d682e2e22..eaecdf41d6d 100644 --- a/sys/dev/fdt/rkrng.c +++ b/sys/dev/fdt/rkrng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkrng.c,v 1.2 2020/04/09 09:25:50 kettenis Exp $ */ +/* $OpenBSD: rkrng.c,v 1.3 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/fdt.h> -#include <dev/rndvar.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_clock.h> #include <dev/ofw/fdt.h> diff --git a/sys/dev/fdt/sxisid.c b/sys/dev/fdt/sxisid.c index 8a5a11b62d0..bb7abc8b0b5 100644 --- a/sys/dev/fdt/sxisid.c +++ b/sys/dev/fdt/sxisid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxisid.c,v 1.2 2020/01/23 03:27:56 kettenis Exp $ */ +/* $OpenBSD: sxisid.c,v 1.3 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2019 Krystian Lewandowski * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org> @@ -28,7 +28,6 @@ #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_misc.h> #include <dev/ofw/fdt.h> -#include <dev/rndvar.h> /* Registers */ #define SID_PRCTL 0x40 diff --git a/sys/dev/ic/ccp.c b/sys/dev/ic/ccp.c index 360e24938f4..5a04b73938f 100644 --- a/sys/dev/ic/ccp.c +++ b/sys/dev/ic/ccp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccp.c,v 1.2 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: ccp.c,v 1.3 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2018 David Gwynne <dlg@openbsd.org> @@ -26,8 +26,6 @@ #include <machine/bus.h> -#include <dev/rndvar.h> - #include <dev/ic/ccpvar.h> #define CCP_REG_TRNG 0xc diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c index 3abe03de722..6df82858016 100644 --- a/sys/dev/pci/amdpm.c +++ b/sys/dev/pci/amdpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpm.c,v 1.34 2020/01/09 14:35:19 mpi Exp $ */ +/* $OpenBSD: amdpm.c,v 1.35 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -59,7 +59,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <dev/rndvar.h> #include <dev/i2c/i2cvar.h> #ifdef AMDPM_DEBUG diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 0ca6a9d0aa2..6c10f95b061 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.41 2019/12/16 04:50:48 cheloha Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.42 2020/05/29 04:42:25 deraadt Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -103,7 +103,6 @@ #include <uvm/uvm_extern.h> -#include <dev/rndvar.h> #include <dev/ic/bt8xx.h> #include <dev/pci/bktr/bktr_reg.h> #include <dev/pci/bktr/bktr_tuner.h> diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index 0bfd489dc70..9e0ef43142d 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hifn7751.c,v 1.179 2020/01/11 21:34:03 cheloha Exp $ */ +/* $OpenBSD: hifn7751.c,v 1.180 2020/05/29 04:42:25 deraadt Exp $ */ /* * Invertex AEON / Hifn 7751 driver @@ -55,7 +55,6 @@ #include <sys/device.h> #include <crypto/cryptodev.h> -#include <dev/rndvar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c index 801e982455f..a0a595f7899 100644 --- a/sys/dev/pci/safe.c +++ b/sys/dev/pci/safe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safe.c,v 1.43 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: safe.c,v 1.44 2020/05/29 04:42:25 deraadt Exp $ */ /*- * Copyright (c) 2003 Sam Leffler, Errno Consulting @@ -46,7 +46,6 @@ #include <crypto/sha1.h> #include <crypto/cryptodev.h> #include <crypto/cryptosoft.h> -#include <dev/rndvar.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 9307d1fe4a8..a9020f7e615 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsec.c,v 1.165 2020/01/10 23:09:23 cheloha Exp $ */ +/* $OpenBSD: ubsec.c,v 1.166 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -50,7 +50,6 @@ #include <crypto/cryptodev.h> #include <crypto/cryptosoft.h> -#include <dev/rndvar.h> #include <crypto/md5.h> #include <crypto/sha1.h> diff --git a/sys/dev/pv/hyperv.c b/sys/dev/pv/hyperv.c index 3ab2ae22831..b32facdacb1 100644 --- a/sys/dev/pv/hyperv.c +++ b/sys/dev/pv/hyperv.c @@ -63,8 +63,6 @@ #include <machine/i82489var.h> -#include <dev/rndvar.h> - #include <dev/pv/pvvar.h> #include <dev/pv/pvreg.h> #include <dev/pv/hypervreg.h> diff --git a/sys/dev/pv/hypervic.c b/sys/dev/pv/hypervic.c index aad954830c1..ef96dce7f44 100644 --- a/sys/dev/pv/hypervic.c +++ b/sys/dev/pv/hypervic.c @@ -64,8 +64,6 @@ #include <machine/i82489var.h> -#include <dev/rndvar.h> - #include <net/if.h> #include <net/if_dl.h> #include <netinet/in.h> diff --git a/sys/dev/pv/pvbus.c b/sys/dev/pv/pvbus.c index 7f4f85033f0..00c64647dc9 100644 --- a/sys/dev/pv/pvbus.c +++ b/sys/dev/pv/pvbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pvbus.c,v 1.20 2020/01/24 05:14:51 jsg Exp $ */ +/* $OpenBSD: pvbus.c,v 1.21 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -38,8 +38,6 @@ #include <machine/bus.h> #include <machine/vmmvar.h> -#include <dev/rndvar.h> - #include <dev/pv/pvvar.h> #include <dev/pv/pvreg.h> diff --git a/sys/dev/pv/viornd.c b/sys/dev/pv/viornd.c index 4c734554dbc..da262d88a9e 100644 --- a/sys/dev/pv/viornd.c +++ b/sys/dev/pv/viornd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viornd.c,v 1.3 2019/05/26 15:20:04 sf Exp $ */ +/* $OpenBSD: viornd.c,v 1.4 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2014 Stefan Fritsch <sf@sfritsch.de> @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <sys/device.h> #include <sys/pool.h> -#include <dev/rndvar.h> #include <dev/pv/virtioreg.h> #include <dev/pv/virtiovar.h> diff --git a/sys/dev/pv/vmmci.c b/sys/dev/pv/vmmci.c index 922b8a5ae94..a88d1c35340 100644 --- a/sys/dev/pv/vmmci.c +++ b/sys/dev/pv/vmmci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmmci.c,v 1.6 2019/12/31 01:26:56 jsg Exp $ */ +/* $OpenBSD: vmmci.c,v 1.7 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2017 Reyk Floeter <reyk@openbsd.org> @@ -32,7 +32,6 @@ #include <dev/pv/virtioreg.h> #include <dev/pv/virtiovar.h> #include <dev/pv/pvvar.h> -#include <dev/rndvar.h> enum vmmci_cmd { VMMCI_NONE = 0, diff --git a/sys/dev/pv/vmt.c b/sys/dev/pv/vmt.c index 80ebbb9668b..2dfeee97d87 100644 --- a/sys/dev/pv/vmt.c +++ b/sys/dev/pv/vmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmt.c,v 1.17 2020/02/16 03:23:05 jmatthew Exp $ */ +/* $OpenBSD: vmt.c,v 1.18 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2007 David Crawshaw <david@zentus.com> @@ -45,7 +45,6 @@ #include <netinet/in.h> #include <dev/pv/pvvar.h> -#include <dev/rndvar.h> /* "The" magic number, always occupies the EAX register. */ #define VM_MAGIC 0x564D5868 diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c index 16fcee3d48b..24b81ecec35 100644 --- a/sys/dev/pv/xen.c +++ b/sys/dev/pv/xen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xen.c,v 1.95 2020/02/13 15:39:02 mikeb Exp $ */ +/* $OpenBSD: xen.c,v 1.96 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2015, 2016, 2017 Mike Belopuhov @@ -49,8 +49,6 @@ #include <machine/i82489var.h> -#include <dev/rndvar.h> - #include <dev/pv/pvvar.h> #include <dev/pv/pvreg.h> #include <dev/pv/xenreg.h> diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c index 3635db0249e..8802965514a 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rnd.c,v 1.218 2020/05/29 01:13:14 deraadt Exp $ */ +/* $OpenBSD: rnd.c,v 1.219 2020/05/29 04:42:24 deraadt Exp $ */ /* * Copyright (c) 2011 Theo de Raadt. @@ -81,7 +81,6 @@ #define KEYSTREAM_ONLY #include <crypto/chacha_private.h> -#include <dev/rndvar.h> #include <uvm/uvm_extern.h> /* diff --git a/sys/dev/rndvar.h b/sys/dev/rndvar.h deleted file mode 100644 index f5e3b9fb9f0..00000000000 --- a/sys/dev/rndvar.h +++ /dev/null @@ -1,43 +0,0 @@ -/* $OpenBSD: rndvar.h,v 1.40 2020/05/25 15:24:32 deraadt Exp $ */ - -/* - * Copyright (c) 1996,2000 Michael Shalayeff. - * - * This software derived from one contributed by Theodore Ts'o. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#ifndef __RNDVAR_H__ -#define __RNDVAR_H__ - -#ifdef _KERNEL -void random_start(int); - -void enqueue_randomness(unsigned int); -void suspend_randomness(void); -void resume_randomness(char *, size_t); - -#endif /* _KERNEL */ - -#endif /* __RNDVAR_H__ */ diff --git a/sys/dev/usb/uonerng.c b/sys/dev/usb/uonerng.c index 1958508635a..890e765b5f4 100644 --- a/sys/dev/usb/uonerng.c +++ b/sys/dev/usb/uonerng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uonerng.c,v 1.4 2018/07/09 20:06:12 jasper Exp $ */ +/* $OpenBSD: uonerng.c,v 1.5 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (C) 2015 Devin Reade <gdr@gno.org> * Copyright (C) 2015 Sean Levy <attila@stalphonsos.com> @@ -44,8 +44,6 @@ #include <dev/usb/usbdevs.h> #include <dev/usb/usbcdc.h> -#include <dev/rndvar.h> - /* * The OneRNG is documented to provide ~350kbits/s of entropy at * ~7.8 bits/byte, and when used at a lower rate providing close diff --git a/sys/dev/usb/urng.c b/sys/dev/usb/urng.c index 0b30250f201..566e227a90d 100644 --- a/sys/dev/usb/urng.c +++ b/sys/dev/usb/urng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: urng.c,v 1.9 2018/07/09 20:09:00 jasper Exp $ */ +/* $OpenBSD: urng.c,v 1.10 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2017 Jasper Lievisse Adriaanse <jasper@openbsd.org> @@ -38,8 +38,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdevs.h> -#include <dev/rndvar.h> - #define DEVNAME(_sc) ((_sc)->sc_dev.dv_xname) #ifdef URNG_DEBUG diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index a611b4a0c65..eba5f5eb00e 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.64 2020/03/24 12:34:14 anton Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.65 2020/05/29 04:42:25 deraadt Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -111,7 +111,6 @@ #include <dev/wscons/wsmousevar.h> #include <dev/wscons/wseventvar.h> #include <dev/wscons/wsmouseinput.h> -#include <dev/rndvar.h> #include "wsmux.h" #include "wsdisplay.h" diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 51db3b27e2f..95354426902 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.298 2020/05/25 15:24:30 deraadt Exp $ */ +/* $OpenBSD: init_main.c,v 1.299 2020/05/29 04:42:25 deraadt Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -83,8 +83,6 @@ #include <uvm/uvm_extern.h> -#include <dev/rndvar.h> - #include <ufs/ufs/quota.h> #include <net/if.h> diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 4b9eedf50b9..88d4a3379f9 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_tc.c,v 1.56 2020/05/20 17:21:08 cheloha Exp $ */ +/* $OpenBSD: kern_tc.c,v 1.57 2020/05/29 04:42:25 deraadt Exp $ */ /* * Copyright (c) 2000 Poul-Henning Kamp <phk@FreeBSD.org> @@ -34,7 +34,6 @@ #include <sys/timetc.h> #include <sys/queue.h> #include <sys/malloc.h> -#include <dev/rndvar.h> /* * A large step happens on boot. This constant detects such steps. diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index b676e74a71b..e73d5092d7e 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.236 2020/03/13 09:30:22 mpi Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.237 2020/05/29 04:42:25 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -63,7 +63,6 @@ #include <net/if.h> -#include <dev/rndvar.h> #include <dev/cons.h> #include <lib/libz/zlib.h> diff --git a/sys/kern/tty.c b/sys/kern/tty.c index e9f98f87e01..738ca2698df 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.155 2020/05/08 07:31:46 mpi Exp $ */ +/* $OpenBSD: tty.c,v 1.156 2020/05/29 04:42:25 deraadt Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -66,7 +66,6 @@ #include <uvm/uvm_extern.h> #include <dev/cons.h> -#include <dev/rndvar.h> #include "pty.h" diff --git a/sys/net/if.c b/sys/net/if.c index aaf7e032a0c..ff7a03f7e0a 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.605 2020/05/27 11:19:28 mpi Exp $ */ +/* $OpenBSD: if.c,v 1.606 2020/05/29 04:42:25 deraadt Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -87,8 +87,6 @@ #include <sys/proc.h> #include <sys/stdint.h> /* uintptr_t */ -#include <dev/rndvar.h> - #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 814f9d58cc2..b4493a8c8d4 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.146 2020/05/27 11:19:29 mpi Exp $ */ +/* $OpenBSD: systm.h,v 1.147 2020/05/29 04:42:25 deraadt Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -211,6 +211,11 @@ int copyin(const void *, void *, size_t) int copyout(const void *, void *, size_t); int copyin32(const uint32_t *, uint32_t *); +void random_start(int); +void enqueue_randomness(unsigned int); +void suspend_randomness(void); +void resume_randomness(char *, size_t); + struct arc4random_ctx; void arc4random_buf(void *, size_t) __attribute__ ((__bounded__(__buffer__,1,2))); |