Module Name: src
Committed By: macallan
Date: Wed May 12 06:11:31 UTC 2010
Modified Files:
src/sys/arch/powerpc/pic: intr.c
Log Message:
make this work again
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/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/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.8 src/sys/arch/powerpc/pic/intr.c:1.9
--- src/sys/arch/powerpc/pic/intr.c:1.8 Sat Apr 24 09:39:57 2010
+++ src/sys/arch/powerpc/pic/intr.c Wed May 12 06:11:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.8 2010/04/24 09:39:57 kiyohara Exp $ */
+/* $NetBSD: intr.c,v 1.9 2010/05/12 06:11:31 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.8 2010/04/24 09:39:57 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.9 2010/05/12 06:11:31 macallan Exp $");
#include "opt_multiprocessor.h"
@@ -682,7 +682,7 @@
__asm volatile("sync; eieio"); /* don't reorder.... */
ocpl = ci->ci_cpl;
- ci->ci_cpl = ncpl;
+ ci->ci_cpl = ocpl | ncpl;
__asm volatile("sync; eieio"); /* reorder protect */
return ocpl;
}
