Module Name: src
Committed By: martin
Date: Sat May 14 11:32:43 UTC 2022
Modified Files:
src/sys/arch/hppa/hppa [netbsd-9]: hppa_machdep.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.34.1 src/sys/arch/hppa/hppa/hppa_machdep.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/hppa/hppa/hppa_machdep.c
diff -u src/sys/arch/hppa/hppa/hppa_machdep.c:1.29 src/sys/arch/hppa/hppa/hppa_machdep.c:1.29.34.1
--- src/sys/arch/hppa/hppa/hppa_machdep.c:1.29 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/hppa/hppa_machdep.c Sat May 14 11:32:43 2022
@@ -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;
