Tue Apr 14 12:19:57 2015 UTC ()
No need for <sys/rnd.h> here either.  Missed this one yesterday too.


(riastradh)
diff -r1.3 -r1.4 src/sys/compat/sys/rnd.h
cvs diff -r1.3 -r1.4 src/sys/compat/sys/rnd.h (expand / switch to unified diff)

--- src/sys/compat/sys/rnd.h 2015/04/14 06:11:15 1.3
+++ src/sys/compat/sys/rnd.h 2015/04/14 12:19:57 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rnd.h,v 1.3 2015/04/14 06:11:15 nat Exp $ */ 1/* $NetBSD: rnd.h,v 1.4 2015/04/14 12:19:57 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1997,2011 The NetBSD Foundation, Inc. 4 * Copyright (c) 1997,2011 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Michael Graff <explorer@flame.org>. This code uses ideas and 8 * by Michael Graff <explorer@flame.org>. This code uses ideas and
9 * algorithms from the Linux driver written by Ted Ts'o. 9 * algorithms from the Linux driver written by Ted Ts'o.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -35,27 +35,26 @@ @@ -35,27 +35,26 @@
35 35
36#if defined(_KERNEL_OPT) 36#if defined(_KERNEL_OPT)
37#include "opt_compat_netbsd.h" 37#include "opt_compat_netbsd.h"
38#include "opt_compat_netbsd32.h" 38#include "opt_compat_netbsd32.h"
39#endif 39#endif
40 40
41#include <sys/types.h> 41#include <sys/types.h>
42#include <sys/ioctl.h> 42#include <sys/ioctl.h>
43 43
44#ifdef COMPAT_NETBSD32 44#ifdef COMPAT_NETBSD32
45#include <compat/netbsd32/netbsd32.h> 45#include <compat/netbsd32/netbsd32.h>
46#endif /* COMPAT_NETBSD32 */ 46#endif /* COMPAT_NETBSD32 */
47 47
48#include <sys/rnd.h> 
49#include <sys/rndio.h> 48#include <sys/rndio.h>
50 49
51/* 50/*
52 * NetBSD-5 used "void *state" in the rndsource_t struct. rndsource_t 51 * NetBSD-5 used "void *state" in the rndsource_t struct. rndsource_t
53 * was used in rnstat_t and rnstat_name_t, which were used by 52 * was used in rnstat_t and rnstat_name_t, which were used by
54 * the NetBSD-5 RNDGETSRCNUM and RNDGETSRCNAME ioctls. 53 * the NetBSD-5 RNDGETSRCNUM and RNDGETSRCNAME ioctls.
55 * 54 *
56 */ 55 */
57 56
58/* Sanitized random source view for userspace. */ 57/* Sanitized random source view for userspace. */
59typedef struct { 58typedef struct {
60 char name[16]; /* device name */ 59 char name[16]; /* device name */
61 uint32_t unused_time; /* was: last time recorded */ 60 uint32_t unused_time; /* was: last time recorded */