Date: Fri, 2 May 2014 13:32:07 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265226 - in projects/random_number_generator: sys/amd64/conf sys/boot/forth sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/conf sys/i386/conf sys/kern sys/modules sys/modules/linde... Message-ID: <201405021332.s42DW7pm060758@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Fri May 2 13:32:07 2014 New Revision: 265226 URL: http://svnweb.freebsd.org/changeset/base/265226 Log: MFC - tracking commit. Merging r265213 through r265225. Deleted: projects/random_number_generator/sys/modules/lindev/ projects/random_number_generator/tools/kerneldoc/subsys/Doxyfile-dev_lindev Modified: projects/random_number_generator/sys/amd64/conf/NOTES projects/random_number_generator/sys/boot/forth/loader.conf projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c projects/random_number_generator/sys/conf/files.amd64 projects/random_number_generator/sys/conf/files.i386 projects/random_number_generator/sys/conf/files.pc98 projects/random_number_generator/sys/i386/conf/NOTES projects/random_number_generator/sys/kern/kern_mtxpool.c projects/random_number_generator/sys/modules/Makefile projects/random_number_generator/sys/pc98/conf/NOTES projects/random_number_generator/sys/sys/kernel.h projects/random_number_generator/sys/sys/mutex.h projects/random_number_generator/sys/sys/param.h Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/crypto/openssh/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/cddl/contrib/opensolaris/ (props changed) projects/random_number_generator/sys/conf/ (props changed) Modified: projects/random_number_generator/sys/amd64/conf/NOTES ============================================================================== --- projects/random_number_generator/sys/amd64/conf/NOTES Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/amd64/conf/NOTES Fri May 2 13:32:07 2014 (r265226) @@ -647,8 +647,5 @@ options VM_KMEM_SIZE_SCALE options NDISAPI device ndis -# Linux-specific pseudo devices support -device lindev - # Module to enable execution of application via emulators like QEMU options IMAGACT_BINMISC Modified: projects/random_number_generator/sys/boot/forth/loader.conf ============================================================================== --- projects/random_number_generator/sys/boot/forth/loader.conf Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/boot/forth/loader.conf Fri May 2 13:32:07 2014 (r265226) @@ -241,7 +241,6 @@ screensave_name="green_saver" # Set to t ibcs2_load="NO" # IBCS2 (SCO) emulation ibcs2_coff_load="NO" linux_load="NO" # Linux emulation -lindev_load="NO" # Linux-specific pseudo devices (see lindev(4)) svr4_load="NO" # SystemV R4 emulation streams_load="NO" # System V streams module Modified: projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c ============================================================================== --- projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c Fri May 2 13:32:07 2014 (r265226) @@ -490,7 +490,6 @@ trim_map_vdev_commit(spa_t *spa, zio_t * zio_nowait(zio_trim(zio, spa, vd, offset, size)); mutex_enter(&tm->tm_lock); - ts = trim_map_first(tm, txgtarget, txgsafe, timelimit); } mutex_exit(&tm->tm_lock); } Modified: projects/random_number_generator/sys/conf/files.amd64 ============================================================================== --- projects/random_number_generator/sys/conf/files.amd64 Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/conf/files.amd64 Fri May 2 13:32:07 2014 (r265226) @@ -232,8 +232,6 @@ dev/hyperv/vmbus/hv_hv.c optional hyp dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv dev/kbd/kbd.c optional atkbd | sc | ukbd | vt -dev/lindev/full.c optional lindev -dev/lindev/lindev.c optional lindev dev/nfe/if_nfe.c optional nfe pci dev/ntb/if_ntb/if_ntb.c optional if_ntb dev/ntb/ntb_hw/ntb_hw.c optional if_ntb ntb_hw Modified: projects/random_number_generator/sys/conf/files.i386 ============================================================================== --- projects/random_number_generator/sys/conf/files.i386 Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/conf/files.i386 Fri May 2 13:32:07 2014 (r265226) @@ -240,8 +240,6 @@ dev/ipmi/ipmi_pci.c optional ipmi pci dev/ipmi/ipmi_linux.c optional ipmi compat_linux dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/le/if_le_isa.c optional le isa -dev/lindev/full.c optional lindev -dev/lindev/lindev.c optional lindev dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa dev/nfe/if_nfe.c optional nfe pci Modified: projects/random_number_generator/sys/conf/files.pc98 ============================================================================== --- projects/random_number_generator/sys/conf/files.pc98 Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/conf/files.pc98 Fri May 2 13:32:07 2014 (r265226) @@ -110,8 +110,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/io/iodev.c optional io dev/kbd/kbd.c optional pckbd | sc | ukbd dev/le/if_le_cbus.c optional le isa -dev/lindev/full.c optional lindev -dev/lindev/lindev.c optional lindev dev/mse/mse.c optional mse dev/mse/mse_cbus.c optional mse isa dev/sbni/if_sbni.c optional sbni Modified: projects/random_number_generator/sys/i386/conf/NOTES ============================================================================== --- projects/random_number_generator/sys/i386/conf/NOTES Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/i386/conf/NOTES Fri May 2 13:32:07 2014 (r265226) @@ -1002,9 +1002,6 @@ device streams # STREAMS network drive options NDISAPI device ndis -# Linux-specific pseudo devices support -device lindev - ##################################################################### # VM OPTIONS Modified: projects/random_number_generator/sys/kern/kern_mtxpool.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_mtxpool.c Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/kern/kern_mtxpool.c Fri May 2 13:32:07 2014 (r265226) @@ -59,9 +59,6 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_MTXPOOL, "mtx_pool", "mutex pool"); /* Pool sizes must be a power of two */ -#ifndef MTX_POOL_LOCKBUILDER_SIZE -#define MTX_POOL_LOCKBUILDER_SIZE 128 -#endif #ifndef MTX_POOL_SLEEP_SIZE #define MTX_POOL_SLEEP_SIZE 128 #endif @@ -78,18 +75,12 @@ struct mtx_pool { struct mtx mtx_pool_ary[1]; }; -static struct mtx_pool_lockbuilder { - struct mtxpool_header mtx_pool_header; - struct mtx mtx_pool_ary[MTX_POOL_LOCKBUILDER_SIZE]; -} lockbuilder_pool; - #define mtx_pool_size mtx_pool_header.mtxpool_size #define mtx_pool_mask mtx_pool_header.mtxpool_mask #define mtx_pool_shift mtx_pool_header.mtxpool_shift #define mtx_pool_next mtx_pool_header.mtxpool_next struct mtx_pool *mtxpool_sleep; -struct mtx_pool *mtxpool_lockbuilder; #if UINTPTR_MAX == UINT64_MAX /* 64 bits */ # define POINTER_BITS 64 @@ -166,15 +157,6 @@ mtx_pool_destroy(struct mtx_pool **poolp } static void -mtx_pool_setup_static(void *dummy __unused) -{ - mtx_pool_initialize((struct mtx_pool *)&lockbuilder_pool, - "lockbuilder mtxpool", MTX_POOL_LOCKBUILDER_SIZE, - MTX_DEF | MTX_NOWITNESS | MTX_QUIET); - mtxpool_lockbuilder = (struct mtx_pool *)&lockbuilder_pool; -} - -static void mtx_pool_setup_dynamic(void *dummy __unused) { mtxpool_sleep = mtx_pool_create("sleep mtxpool", @@ -202,17 +184,5 @@ mtx_pool_alloc(struct mtx_pool *pool) return (&pool->mtx_pool_ary[i]); } -/* - * The lockbuilder pool must be initialized early because the lockmgr - * and sx locks depend on it. The sx locks are used in the kernel - * memory allocator. The lockmgr subsystem is initialized by - * SYSINIT(..., SI_SUB_LOCKMGR, ...). - * - * We can't call malloc() to dynamically allocate the sleep pool - * until after kmeminit() has been called, which is done by - * SYSINIT(..., SI_SUB_KMEM, ...). - */ -SYSINIT(mtxpooli1, SI_SUB_MTX_POOL_STATIC, SI_ORDER_FIRST, - mtx_pool_setup_static, NULL); SYSINIT(mtxpooli2, SI_SUB_MTX_POOL_DYNAMIC, SI_ORDER_FIRST, mtx_pool_setup_dynamic, NULL); Modified: projects/random_number_generator/sys/modules/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/Makefile Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/modules/Makefile Fri May 2 13:32:07 2014 (r265226) @@ -186,7 +186,6 @@ SUBDIR= \ libiconv \ libmbpool \ libmchain \ - ${_lindev} \ ${_linprocfs} \ ${_linsysfs} \ ${_linux} \ @@ -516,7 +515,6 @@ _io= io .if ${MK_OFED} != "no" || defined(ALL_MODULES) _ipoib= ipoib .endif -_lindev= lindev _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux @@ -720,7 +718,6 @@ _iwnfw= iwnfw .endif _ixgb= ixgb _ixgbe= ixgbe -_lindev= lindev _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux Modified: projects/random_number_generator/sys/pc98/conf/NOTES ============================================================================== --- projects/random_number_generator/sys/pc98/conf/NOTES Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/pc98/conf/NOTES Fri May 2 13:32:07 2014 (r265226) @@ -545,9 +545,6 @@ options COMPAT_SVR4 # build emulator st options DEBUG_SVR4 # enable verbose debugging device streams # STREAMS network driver (required for svr4). -# Linux-specific pseudo devices support -device lindev - ##################################################################### # VM OPTIONS Modified: projects/random_number_generator/sys/sys/kernel.h ============================================================================== --- projects/random_number_generator/sys/sys/kernel.h Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/sys/kernel.h Fri May 2 13:32:07 2014 (r265226) @@ -92,7 +92,6 @@ enum sysinit_sub_id { SI_SUB_COPYRIGHT = 0x0800001, /* first use of console*/ SI_SUB_SETTINGS = 0x0880000, /* check and recheck settings */ SI_SUB_MTX_POOL_STATIC = 0x0900000, /* static mutex pool */ - SI_SUB_LOCKMGR = 0x0980000, /* lockmgr locks */ SI_SUB_VM = 0x1000000, /* virtual memory system init*/ SI_SUB_KMEM = 0x1800000, /* kernel memory*/ SI_SUB_KVM_RSRC = 0x1A00000, /* kvm operational limits*/ Modified: projects/random_number_generator/sys/sys/mutex.h ============================================================================== --- projects/random_number_generator/sys/sys/mutex.h Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/sys/mutex.h Fri May 2 13:32:07 2014 (r265226) @@ -323,12 +323,8 @@ struct mtx *mtx_pool_alloc(struct mtx_po mtx_unlock_spin(mtx_pool_find((pool), (ptr))) /* - * mtxpool_lockbuilder is a pool of sleep locks that is not witness - * checked and should only be used for building higher level locks. - * * mtxpool_sleep is a general purpose pool of sleep mutexes. */ -extern struct mtx_pool *mtxpool_lockbuilder; extern struct mtx_pool *mtxpool_sleep; #ifndef LOCK_DEBUG Modified: projects/random_number_generator/sys/sys/param.h ============================================================================== --- projects/random_number_generator/sys/sys/param.h Fri May 2 11:09:01 2014 (r265225) +++ projects/random_number_generator/sys/sys/param.h Fri May 2 13:32:07 2014 (r265226) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100019 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100020 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405021332.s42DW7pm060758>