From owner-svn-ports-head@freebsd.org Tue Feb 21 19:20:48 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0EA5CE7E48; Tue, 21 Feb 2017 19:20:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB3CC19A7; Tue, 21 Feb 2017 19:20:48 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1LJKlft035273; Tue, 21 Feb 2017 19:20:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1LJKl6r035272; Tue, 21 Feb 2017 19:20:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702211920.v1LJKl6r035272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 21 Feb 2017 19:20:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434550 - in head/emulators/open-vm-tools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 19:20:49 -0000 Author: ngie (src committer) Date: Tue Feb 21 19:20:47 2017 New Revision: 434550 URL: https://svnweb.freebsd.org/changeset/ports/434550 Log: emulators/open-vm-tools: change sysctl_add_oid use to SYSCTL_ADD_OID sysctl_add_oid was changed in base/head@r310051 to take a label parameter, and open-vm-tools doesn't supply it as it depends on the old KPI signature. SYSCTL_ADD_OID doesn't require the label parameter since its inception though, thus it's a backwards compatible solution for adding sysctl oids. PR: 215353 Reported by: dim Submitted by: ed Reviewed by: ed, lwhsu Approved by: lwhsu Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D9698 Modified: head/emulators/open-vm-tools/Makefile head/emulators/open-vm-tools/files/patch-vmmemctl-os.c Modified: head/emulators/open-vm-tools/Makefile ============================================================================== --- head/emulators/open-vm-tools/Makefile Tue Feb 21 16:37:05 2017 (r434549) +++ head/emulators/open-vm-tools/Makefile Tue Feb 21 19:20:47 2017 (r434550) @@ -3,7 +3,7 @@ PORTNAME= open-vm-tools PORTVERSION= ${BUILD_VER} -PORTREVISION= 16 +PORTREVISION= 17 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/stable-9.4.x Modified: head/emulators/open-vm-tools/files/patch-vmmemctl-os.c ============================================================================== --- head/emulators/open-vm-tools/files/patch-vmmemctl-os.c Tue Feb 21 16:37:05 2017 (r434549) +++ head/emulators/open-vm-tools/files/patch-vmmemctl-os.c Tue Feb 21 19:20:47 2017 (r434550) @@ -1,5 +1,5 @@ ---- modules/freebsd/vmmemctl/os.c.orig 2013-09-23 10:51:10.000000000 -0500 -+++ modules/freebsd/vmmemctl/os.c 2014-04-23 15:51:43.823041178 -0500 +--- modules/freebsd/vmmemctl/os.c.orig 2013-09-23 08:51:10.000000000 -0700 ++++ modules/freebsd/vmmemctl/os.c 2017-02-20 21:19:02.000000000 -0800 @@ -37,9 +37,11 @@ #include #include @@ -12,7 +12,7 @@ #include #include -@@ -223,7 +225,11 @@ static __inline__ unsigned long os_ffz(u +@@ -223,7 +225,11 @@ unsigned long OS_ReservedPageGetLimit(void) { @@ -24,7 +24,7 @@ } -@@ -295,7 +301,13 @@ OS_ReservedPageGetHandle(PA64 pa) // +@@ -295,7 +301,13 @@ Mapping OS_MapPageHandle(PageHandle handle) // IN { @@ -38,7 +38,7 @@ vm_page_t page = (vm_page_t)handle; if (!res) { -@@ -352,7 +364,11 @@ void +@@ -352,7 +364,11 @@ OS_UnmapPage(Mapping mapping) // IN { pmap_qremove((vm_offset_t)mapping, 1); @@ -50,7 +50,7 @@ } -@@ -360,7 +376,11 @@ static void +@@ -360,7 +376,11 @@ os_pmap_alloc(os_pmap *p) // IN { /* number of pages (div. 8) */ @@ -62,7 +62,7 @@ /* * expand to nearest word boundary -@@ -369,14 +389,23 @@ os_pmap_alloc(os_pmap *p) // IN +@@ -369,14 +389,23 @@ p->size = (p->size + sizeof(unsigned long) - 1) & ~(sizeof(unsigned long) - 1); @@ -86,7 +86,7 @@ p->size = 0; p->bitmap = NULL; } -@@ -449,12 +478,31 @@ os_kmem_free(vm_page_t page) // IN +@@ -449,12 +478,31 @@ os_state *state = &global_state; os_pmap *pmap = &state->pmap; @@ -123,7 +123,7 @@ } -@@ -466,8 +514,19 @@ os_kmem_alloc(int alloc_normal_failed) / +@@ -466,8 +514,19 @@ os_state *state = &global_state; os_pmap *pmap = &state->pmap; @@ -143,7 +143,7 @@ return NULL; } -@@ -488,6 +547,11 @@ os_kmem_alloc(int alloc_normal_failed) / +@@ -488,6 +547,11 @@ if (!page) { os_pmap_putindex(pmap, pindex); } @@ -155,3 +155,12 @@ return page; } +@@ -824,7 +888,7 @@ + static void + vmmemctl_init_sysctl(void) + { +- oid = sysctl_add_oid(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO, ++ oid = SYSCTL_ADD_OID(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO, + BALLOON_NAME, CTLTYPE_STRING | CTLFLAG_RD, + 0, 0, vmmemctl_sysctl, "A", + BALLOON_NAME_VERBOSE);