Index: stable/12/sys/compat/linuxkpi/common/include/linux/random.h =================================================================== --- stable/12/sys/compat/linuxkpi/common/include/linux/random.h (revision 348088) +++ stable/12/sys/compat/linuxkpi/common/include/linux/random.h (revision 348089) @@ -1,64 +1,66 @@ /*- * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. * * 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 unmodified, 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 AUTHOR ``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 AUTHOR 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. * * $FreeBSD$ */ #ifndef _LINUX_RANDOM_H_ #define _LINUX_RANDOM_H_ #include #include +#define get_random_u32() get_random_int() + static inline void get_random_bytes(void *buf, int nbytes) { if (read_random(buf, nbytes) == 0) arc4rand(buf, nbytes, 0); } static inline u_int get_random_int(void) { u_int val; get_random_bytes(&val, sizeof(val)); return (val); } static inline u_long get_random_long(void) { u_long val; get_random_bytes(&val, sizeof(val)); return (val); } #endif /* _LINUX_RANDOM_H_ */ Index: stable/12 =================================================================== --- stable/12 (revision 348088) +++ stable/12 (revision 348089) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r347621