Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2018 17:14:53 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r337267 - stable/11/sys/i386/i386
Message-ID:  <201808031714.w73HErNw065642@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Fri Aug  3 17:14:52 2018
New Revision: 337267
URL: https://svnweb.freebsd.org/changeset/base/337267

Log:
  Fix a mismerge in r337262.
  
  This is a direct commit to stable/11.

Modified:
  stable/11/sys/i386/i386/pmap.c

Modified: stable/11/sys/i386/i386/pmap.c
==============================================================================
--- stable/11/sys/i386/i386/pmap.c	Fri Aug  3 16:44:56 2018	(r337266)
+++ stable/11/sys/i386/i386/pmap.c	Fri Aug  3 17:14:52 2018	(r337267)
@@ -802,7 +802,7 @@ pmap_init(void)
 			panic("pmap_init: pmap_insert_pt_page failed");
 	}
 	PMAP_UNLOCK(kernel_pmap);
-	vm_wire_add(NKPT);
+	atomic_add_int(&vm_cnt.v_wire_count, NKPT);
 
 	/*
 	 * Initialize the address space (zone) for the pv entries.  Set a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808031714.w73HErNw065642>