[src/trunk]: src/sys/arch/powerpc/pic make this work again

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/905ae73d170e
branches:  trunk
changeset: 754771:905ae73d170e
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed May 12 06:11:31 2010 +0000

description:
make this work again

diffstat:

 sys/arch/powerpc/pic/intr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f6de150735f1 -r 905ae73d170e sys/arch/powerpc/pic/intr.c
--- a/sys/arch/powerpc/pic/intr.c       Wed May 12 04:30:18 2010 +0000
+++ b/sys/arch/powerpc/pic/intr.c       Wed May 12 06:11:31 2010 +0000
@@ -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;
 }