CVS commit: src/sys/dev/pad

[Nathanial Sloss]

Module Name:    src
Committed By:   nat
Date:           Fri Jul 10 21:58:56 UTC 2015

Modified Files:
        src/sys/dev/pad: pad.c

Log Message:
Wrap up calls to sc_intr in kpreempt[en/dis]able.

This commit was approved by christos@


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pad/pad.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/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.22 src/sys/dev/pad/pad.c:1.23
--- src/sys/dev/pad/pad.c:1.22	Tue Nov 18 01:53:17 2014
+++ src/sys/dev/pad/pad.c	Fri Jul 10 21:58:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.22 2014/11/18 01:53:17 jmcneill Exp $ */
+/* $NetBSD: pad.c,v 1.23 2015/07/10 21:58:56 nat Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.22 2014/11/18 01:53:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.23 2015/07/10 21:58:56 nat Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -354,6 +354,7 @@ pad_read(dev_t dev, struct uio *uio, int
 	intr = sc->sc_intr;
 	intrarg = sc->sc_intrarg;
 
+	kpreempt_disable();
 	while (uio->uio_resid > 0 && !err) {
 		err = pad_get_block(sc, &pb, min(uio->uio_resid, PAD_BLKSIZE));
 		if (!err) {
@@ -375,6 +376,7 @@ pad_read(dev_t dev, struct uio *uio, int
 		err = cv_wait_sig(&sc->sc_condvar, &sc->sc_lock);
 		if (err != 0) {
 			mutex_exit(&sc->sc_lock);
+			kpreempt_enable();
 			return err;
 		}
 		intr = sc->sc_intr;
@@ -387,6 +389,7 @@ pad_read(dev_t dev, struct uio *uio, int
 		mutex_exit(&sc->sc_intr_lock);
 	}
 	mutex_exit(&sc->sc_lock);
+	kpreempt_enable();
 
 	return err;
 }