CVS commit: src/sys/arch/usermode/usermode

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Mon Sep  5 11:12:51 UTC 2011

Modified Files:
        src/sys/arch/usermode/usermode: intr.c

Log Message:
make sure splraise doesn't lower spl, and spllower doesn't raise it


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/usermode/usermode/intr.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/arch/usermode/usermode/intr.c
diff -u src/sys/arch/usermode/usermode/intr.c:1.1 src/sys/arch/usermode/usermode/intr.c:1.2
--- src/sys/arch/usermode/usermode/intr.c:1.1	Sun Sep  4 21:08:18 2011
+++ src/sys/arch/usermode/usermode/intr.c	Mon Sep  5 11:12:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.1 2011/09/04 21:08:18 jmcneill Exp $ */
+/* $NetBSD: intr.c,v 1.2 2011/09/05 11:12:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1 2011/09/04 21:08:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2 2011/09/05 11:12:51 jmcneill Exp $");
 
 #include <sys/types.h>
 
@@ -47,7 +47,8 @@
 		usermode_sigalrm_blocked = true;
 	}
 
-	usermode_x = x;
+	if (x > usermode_x)
+		usermode_x = x;
 
 	return oldx;
 }
@@ -60,5 +61,6 @@
 		usermode_sigalrm_blocked = false;
 	}
 
-	usermode_x = x;
+	if (usermode_x > x)
+		usermode_x = x;
 }