Module Name: src
Committed By: skrll
Date: Thu Apr 30 20:10:31 UTC 2009
Modified Files:
src/sys/arch/hppa/hppa: trap.S
Log Message:
Correct some CPU ifdefs so that a HP7100_CPU only kernel should compile.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hppa/hppa/trap.S
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/trap.S
diff -u src/sys/arch/hppa/hppa/trap.S:1.27 src/sys/arch/hppa/hppa/trap.S:1.28
--- src/sys/arch/hppa/hppa/trap.S:1.27 Thu Apr 30 07:01:27 2009
+++ src/sys/arch/hppa/hppa/trap.S Thu Apr 30 20:10:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.S,v 1.27 2009/04/30 07:01:27 skrll Exp $ */
+/* $NetBSD: trap.S,v 1.28 2009/04/30 20:10:31 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -631,9 +631,7 @@
LDILDO(dtlb_x)
LDILDO(dtlbna_x)
LDILDO(tlbd_x)
-#endif
-#if defined(HP7100_CPU)
LDILDO(itlb_s)
LDILDO(itlbna_s)
LDILDO(dtlb_s)
@@ -641,7 +639,7 @@
LDILDO(tlbd_s)
#endif
-#if defined(HP7200_CPU)
+#if defined(HP7100_CPU) || defined(HP7200_CPU)
LDILDO(itlb_t)
LDILDO(itlbna_t)
LDILDO(dtlb_t)
@@ -1749,7 +1747,7 @@
EXIT(desidhash_s)
#endif /* defined(HP7000_CPU) || defined(HP7100_CPU) */
-#ifdef HP7200_CPU
+#if defined(HP7100_CPU) || defined(HP7200_CPU)
/*
* void desidhash_t(void)
*/
@@ -1771,7 +1769,7 @@
bv 0(%rp)
extru %t1, 4, 5, %ret0 /* return chip revision */
EXIT(desidhash_t)
-#endif /* HP7200_CPU */
+#endif /* defined(HP7100_CPU) || defined(HP7200_CPU) */
#if defined(HP7100LC_CPU) || defined(HP7300LC_CPU)
/*
