Module Name: src
Committed By: skrll
Date: Tue Apr 6 08:09:47 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
src/sys/arch/hppa/hppa: hppa_machdep.c
Log Message:
Use hppa_cpu_ispa20_p
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.21 -r1.22 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/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.81 src/sys/arch/hp700/hp700/machdep.c:1.82
--- src/sys/arch/hp700/hp700/machdep.c:1.81 Sat Mar 20 23:31:27 2010
+++ src/sys/arch/hp700/hp700/machdep.c Tue Apr 6 08:09:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.81 2010/03/20 23:31:27 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.82 2010/04/06 08:09:46 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.81 2010/03/20 23:31:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.82 2010/04/06 08:09:46 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -787,7 +787,7 @@
cpu_revision = (*cpu_desidhash)();
/* force strong ordering for now */
- if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
+ if (hppa_cpu_ispa20_p())
kpsw |= PSW_O;
snprintf(cpu_model, sizeof(cpu_model), "HP9000/%s", model);
@@ -1694,7 +1694,7 @@
if (pimerror < 0) {
printf(" - WARNING: could not transfer PIM info (%d)", pimerror);
} else {
- if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
+ if (hppa_cpu_ispa20_p())
hppa_pim64_dump(check_type);
else
hppa_pim_dump(check_type);
@@ -1969,4 +1969,3 @@
{
}
#endif /* MODULAR */
-
Index: src/sys/arch/hppa/hppa/hppa_machdep.c
diff -u src/sys/arch/hppa/hppa/hppa_machdep.c:1.21 src/sys/arch/hppa/hppa/hppa_machdep.c:1.22
--- src/sys/arch/hppa/hppa/hppa_machdep.c:1.21 Sat Apr 3 07:46:02 2010
+++ src/sys/arch/hppa/hppa/hppa_machdep.c Tue Apr 6 08:09:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hppa_machdep.c,v 1.21 2010/04/03 07:46:02 skrll Exp $ */
+/* $NetBSD: hppa_machdep.c,v 1.22 2010/04/06 08:09:47 skrll 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.21 2010/04/03 07:46:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.22 2010/04/06 08:09:47 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -252,7 +252,7 @@
#endif
tf->tf_ipsw = gr[0] |
- (hppa_cpu_info->hci_features & HPPA_FTRS_W32B ? PSW_O : 0);
+ (hppa_cpu_ispa20_p() ? PSW_O : 0);
tf->tf_r1 = gr[1];
tf->tf_rp = gr[2];
tf->tf_r3 = gr[3];
