d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r319053 due to lack of sence. As pointed out by kib@ opt_global.h

Browse Source 
contains such fundamental settings as e.g. SMP option and fake
opt_global.h almost never match real configured kernels.

Reported by:	kib@
This commit is contained in:
dchagin 2017-06-04 18:24:41 +00:00
parent c76e32879d
commit ff032734d8
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/compat/linux/linux_misc.c
View File

@ -31,9 +31,6 @@
__FBSDID("$FreeBSD$");
#include "opt_compat.h"
#if defined(KLD_MODULE)
#include "opt_global.h"
#endif
#include <sys/param.h>
#include <sys/blist.h>
@ -2519,7 +2516,6 @@ linux_getrandom(struct thread *td, struct linux_getrandom_args *args)
{
struct uio uio;
struct iovec iov;
int error;
if (args->flags & ~(LINUX_GRND_NONBLOCK|LINUX_GRND_RANDOM))
return (EINVAL);
@ -2536,10 +2532,7 @@ linux_getrandom(struct thread *td, struct linux_getrandom_args *args)
uio.uio_rw = UIO_READ;
uio.uio_td = td;
error = read_random_uio(&uio, args->flags & LINUX_GRND_NONBLOCK);
if (error == 0)
td->td_retval[0] = args->count - uio.uio_resid;
return (error);
return (read_random_uio(&uio, args->flags & LINUX_GRND_NONBLOCK));
}
int

2
sys/conf/config.mk
View File

@ -8,8 +8,6 @@
# the code here when they all produce identical results
# (or should)
.if !defined(KERNBUILDDIR)
opt_global.h:
echo "#define DEV_RANDOM 1" >> ${.TARGET}
opt_bpf.h:
echo "#define DEV_BPF 1" > ${.TARGET}
.if ${MK_INET_SUPPORT} != "no"

2
sys/modules/linux/Makefile
View File

@ -15,7 +15,7 @@ SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.c linux_event.c \
linux${SFX}_machdep.c linux_misc.c linux_signal.c \
linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
linux${SFX}_sysvec.c linux_uid16.c linux_time.c \
linux_timer.c linux_vdso.c opt_global.h \
linux_timer.c linux_vdso.c \
opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
device_if.h bus_if.h assym.s \
linux${SFX}_support.s

2
sys/modules/linux64/Makefile
View File

@ -10,7 +10,7 @@ SRCS= linux_fork.c linux_dummy.c linux_file.c linux_event.c \
linux_machdep.c linux_misc.c linux_ptrace.c linux_signal.c \
linux_socket.c linux_stats.c linux_sysctl.c linux_sysent.c \
linux_sysvec.c linux_time.c linux_vdso.c linux_timer.c \
opt_inet6.h opt_compat.h opt_global.h opt_posix.h opt_usb.h \
opt_inet6.h opt_compat.h opt_posix.h opt_usb.h \
vnode_if.h device_if.h bus_if.h assym.s \
linux_support.s
DPSRCS= linux_genassym.c