CVS commit: [pgoyette-localcount] src/sys/kern

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Tue Apr 25 21:36:41 UTC 2017

Modified Files:
        src/sys/kern [pgoyette-localcount]: subr_devsw.c

Log Message:
Add membar_datadep_consumer() to {b,c}devsw_lookup() to ensure that
the devsw content is visible.

Again, thanks riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.34.2.15 -r1.34.2.16 src/sys/kern/subr_devsw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.34.2.15 src/sys/kern/subr_devsw.c:1.34.2.16
--- src/sys/kern/subr_devsw.c:1.34.2.15	Tue Apr 25 21:31:33 2017
+++ src/sys/kern/subr_devsw.c	Tue Apr 25 21:36:41 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_devsw.c,v 1.34.2.15 2017/04/25 21:31:33 pgoyette Exp $	*/
+/*	$NetBSD: subr_devsw.c,v 1.34.2.16 2017/04/25 21:36:41 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.15 2017/04/25 21:31:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.16 2017/04/25 21:36:41 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dtrace.h"
@@ -452,6 +452,9 @@ bdevsw_lookup(dev_t dev)
 	if (bmajor < 0 || bmajor >= max_bdevsws)
 		return (NULL);
 
+	/* Wait for the content of the struct bdevsw to become visible */
+	membar_datadep_consumer();
+
 	return (bdevsw[bmajor]);
 }
 
@@ -513,6 +516,9 @@ cdevsw_lookup(dev_t dev)
 	if (cmajor < 0 || cmajor >= max_cdevsws)
 		return (NULL);
 
+	/* Wait for the content of the struct bdevsw to become visible */
+	membar_datadep_consumer();
+
 	return (cdevsw[cmajor]);
 }