diff options
| author | martin <martin@NetBSD.org> | 2022-05-14 11:32:43 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2022-05-14 11:32:43 +0000 |
| commit | 00799eae899942f69f9926a4f2e19ba3151635b7 (patch) | |
| tree | 58e2a8ba467a2f8b30df92f8aad27c3a82819cd8 | |
| parent | 4108b4e85ee0ac440edb329fc559f7f0abe50b7b (diff) | |
Pull up following revision(s) (requested by skrll in ticket #1446):
sys/arch/hppa/hppa/hppa_machdep.c: revision 1.33
port-hppa/56830: RAS support is slightly incorrect on hppa
When searching for RAS use tf_iioq_head without the HPPA_PC_PRIV_MASK bits
set.
| -rw-r--r-- | sys/arch/hppa/hppa/hppa_machdep.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/hppa/hppa/hppa_machdep.c b/sys/arch/hppa/hppa/hppa_machdep.c index 9c29a76b3fa..df16f9f9222 100644 --- a/sys/arch/hppa/hppa/hppa_machdep.c +++ b/sys/arch/hppa/hppa/hppa_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: hppa_machdep.c,v 1.29 2014/02/24 07:23:43 skrll Exp $ */ +/* $NetBSD: hppa_machdep.c,v 1.29.34.1 2022/05/14 11:32:43 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.29 2014/02/24 07:23:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.29.34.1 2022/05/14 11:32:43 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -279,7 +279,9 @@ hppa_ras(struct lwp *l) p = l->l_proc; tf = l->l_md.md_regs; - rasaddr = (intptr_t)ras_lookup(p, (void *)tf->tf_iioq_head); + + rasaddr = (intptr_t)ras_lookup(p, + (void *)(tf->tf_iioq_head & ~HPPA_PC_PRIV_MASK)); if (rasaddr != -1) { rasaddr |= HPPA_PC_PRIV_USER; tf->tf_iioq_head = rasaddr; |
