From owner-cvs-src@FreeBSD.ORG Tue Nov 4 17:53:11 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8B0516A4CE; Tue, 4 Nov 2003 17:53:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3420743FB1; Tue, 4 Nov 2003 17:53:11 -0800 (PST) (envelope-from fjoe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA51rAXJ098703; Tue, 4 Nov 2003 17:53:10 -0800 (PST) (envelope-from fjoe@repoman.freebsd.org) Received: (from fjoe@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA51rAQh098693; Tue, 4 Nov 2003 17:53:10 -0800 (PST) (envelope-from fjoe) Message-Id: <200311050153.hA51rAQh098693@repoman.freebsd.org> From: Max Khon Date: Tue, 4 Nov 2003 17:53:10 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/sys syscallsubr.h src/sys/kern sysv_shm.c src/sys/compat/linux linux_ipc.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2003 01:53:11 -0000 fjoe 2003/11/04 17:53:10 PST FreeBSD src repository Modified files: sys/sys syscallsubr.h sys/kern sysv_shm.c sys/compat/linux linux_ipc.c Log: Back out the following revisions: 1.36 +73 -60 src/sys/compat/linux/linux_ipc.c 1.83 +102 -48 src/sys/kern/sysv_shm.c 1.8 +4 -0 src/sys/sys/syscallsubr.h That change was intended to support vmware3, but wantrem parameter is useless because vmware3 uses SYSV shared memory to talk with X server and X server is native application. The patch worked because check for wantrem was not valid (wantrem and SHMSEG_REMOVED was never checked for SHMSEG_ALLOCATED segments). Add kern.ipc.shm_allow_removed (integer, rw) sysctl (default 0) which when set to 1 allows to return removed segments in shm_find_segment_by_shmid() and shm_find_segment_by_shmidx(). MFC after: 1 week Revision Changes Path 1.38 +6 -6 src/sys/compat/linux/linux_ipc.c 1.88 +21 -18 src/sys/kern/sysv_shm.c 1.10 +2 -2 src/sys/sys/syscallsubr.h