Date: Sun, 4 Jun 2017 18:24:41 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r319570 - in head/sys: compat/linux conf modules/linux modules/linux64 Message-ID: <201706041824.v54IOfcW047168@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Sun Jun 4 18:24:41 2017 New Revision: 319570 URL: https://svnweb.freebsd.org/changeset/base/319570 Log: Revert r319053 due to lack of sence. As pointed out by kib@ opt_global.h contains such fundamental settings as e.g. SMP option and fake opt_global.h almost never match real configured kernels. Reported by: kib@ Modified: head/sys/compat/linux/linux_misc.c head/sys/conf/config.mk head/sys/modules/linux/Makefile head/sys/modules/linux64/Makefile Modified: head/sys/compat/linux/linux_misc.c ============================================================================== --- head/sys/compat/linux/linux_misc.c Sun Jun 4 09:11:14 2017 (r319569) +++ head/sys/compat/linux/linux_misc.c Sun Jun 4 18:24:41 2017 (r319570) @@ -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_getran { 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_getran 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 Modified: head/sys/conf/config.mk ============================================================================== --- head/sys/conf/config.mk Sun Jun 4 09:11:14 2017 (r319569) +++ head/sys/conf/config.mk Sun Jun 4 18:24:41 2017 (r319570) @@ -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" Modified: head/sys/modules/linux/Makefile ============================================================================== --- head/sys/modules/linux/Makefile Sun Jun 4 09:11:14 2017 (r319569) +++ head/sys/modules/linux/Makefile Sun Jun 4 18:24:41 2017 (r319570) @@ -15,7 +15,7 @@ SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.c li 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 Modified: head/sys/modules/linux64/Makefile ============================================================================== --- head/sys/modules/linux64/Makefile Sun Jun 4 09:11:14 2017 (r319569) +++ head/sys/modules/linux64/Makefile Sun Jun 4 18:24:41 2017 (r319570) @@ -10,7 +10,7 @@ SRCS= linux_fork.c linux_dummy.c linux_file.c linux_ev 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706041824.v54IOfcW047168>