[src/netbsd-9]: src/sys/arch/hppa/hppa Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/c279924fd66f
branches:  netbsd-9
changeset: 366093:c279924fd66f
user:      martin <martin%NetBSD.org@localhost>
date:      Sat May 14 11:32:43 2022 +0000

description:
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.

diffstat:

 sys/arch/hppa/hppa/hppa_machdep.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 6648679c082b -r c279924fd66f sys/arch/hppa/hppa/hppa_machdep.c
--- a/sys/arch/hppa/hppa/hppa_machdep.c Fri May 13 11:20:04 2022 +0000
+++ b/sys/arch/hppa/hppa/hppa_machdep.c Sat May 14 11:32:43 2022 +0000
@@ -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 @@
 
        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;