svn commit: r363635 - in stable/12/sys: sys vm

[Mateusz Guzik]

Author: mjg
Date: Tue Jul 28 07:07:38 2020
New Revision: 363635
URL: https://svnweb.freebsd.org/changeset/base/363635

Log:
  MFC r363444,r363513:
  
      vm: annotate swap_reserved with __exclusive_cache_line
      Remove leftover macros for long gone vmsize mtx

Modified:
  stable/12/sys/sys/resourcevar.h
  stable/12/sys/vm/swap_pager.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/sys/resourcevar.h
==============================================================================
--- stable/12/sys/sys/resourcevar.h	Tue Jul 28 07:05:49 2020	(r363634)
+++ stable/12/sys/sys/resourcevar.h	Tue Jul 28 07:07:38 2020	(r363635)
@@ -109,9 +109,6 @@ struct uidinfo {
 #endif
 };
 
-#define	UIDINFO_VMSIZE_LOCK(ui)		mtx_lock(&((ui)->ui_vmsize_mtx))
-#define	UIDINFO_VMSIZE_UNLOCK(ui)	mtx_unlock(&((ui)->ui_vmsize_mtx))
-
 struct proc;
 struct rusage_ext;
 struct thread;

Modified: stable/12/sys/vm/swap_pager.c
==============================================================================
--- stable/12/sys/vm/swap_pager.c	Tue Jul 28 07:05:49 2020	(r363634)
+++ stable/12/sys/vm/swap_pager.c	Tue Jul 28 07:07:38 2020	(r363635)
@@ -152,7 +152,7 @@ static int nswapdev;		/* Number of swap devices */
 int swap_pager_avail;
 static struct sx swdev_syscall_lock;	/* serialize swap(on|off) */
 
-static u_long swap_reserved;
+static __exclusive_cache_line u_long swap_reserved;
 static u_long swap_total;
 static int sysctl_page_shift(SYSCTL_HANDLER_ARGS);
 SYSCTL_PROC(_vm, OID_AUTO, swap_reserved, CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE,