From ca091a5e3381471d8ba9981258cdc92d5b4cb6ff Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 31 Jul 1999 17:20:22 +0000
Subject: [PATCH] Fix oversight in last.

---
 sys/arch/hp300/stand/common/samachdep.h |  4 ++--
 sys/arch/hp300/stand/common/srt0.S      | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sys/arch/hp300/stand/common/samachdep.h b/sys/arch/hp300/stand/common/samachdep.h
index 499ef6261188..7ece150467fe 100644
--- a/sys/arch/hp300/stand/common/samachdep.h
+++ b/sys/arch/hp300/stand/common/samachdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: samachdep.h,v 1.3 1997/05/12 07:54:45 thorpej Exp $	*/
+/*	$NetBSD: samachdep.h,v 1.4 1999/07/31 17:20:22 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -60,7 +60,7 @@
 #define MHZ_33		4
 #define MHZ_50		6
 
-extern	int cpuspeed, machineid;
+extern	int cpuspeed, machineid, mmuid;
 extern	int howto;
 extern	int cons_scode;
 extern	u_int opendev;
diff --git a/sys/arch/hp300/stand/common/srt0.S b/sys/arch/hp300/stand/common/srt0.S
index e21b87828116..83935ebce98b 100644
--- a/sys/arch/hp300/stand/common/srt0.S
+++ b/sys/arch/hp300/stand/common/srt0.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: srt0.S,v 1.6 1999/07/31 00:45:28 thorpej Exp $	*/
+/*	$NetBSD: srt0.S,v 1.7 1999/07/31 17:20:22 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -77,6 +77,9 @@ GLOBAL(lowram)
 GLOBAL(machineid)
 	.long	0
 
+GLOBAL(mmuid)
+	.long	0
+
 	.text
 ASENTRY_NOPROFILE(begin)
 	movl	#STACK,sp
@@ -126,8 +129,11 @@ not370:
 	movl	MMUCMD,d0		| read it back
 	btst	#16,d0			| still on?
 	jeq	ihpibcheck		| no, a 360
+	lea	_C_LABEL(mmuid),a0
 	lsrl	#MMUID_SHIFT,d0		| save MMU ID
 	andl	#MMUID_MASK,d0
+	movl	d0,a0@
+	lea	_C_LABEL(machineid),a0
 	cmpb	#MMUID_345,d0		| are we a 345?
 	jeq	isa345
 	cmpb	#MMUID_375,d0		| how about a 375?
@@ -164,9 +170,12 @@ not68030:
 	 * 68040 models
 	 */
 
+	lea	_C_LABEL(mmuid),a0
 	movl	MMUCMD,d0		| get MMU ID
 	lsrl	#MMUID_SHIFT,d0
 	andl	#MMUID_MASK,d0
+	movl	d0,a0@			| save it
+	lea	_C_LABEL(machineid),a0
 	cmpb	#MMUID_425_T,d0		| are we a 425t?
 	jeq	isa425
 	cmpb	#MMUID_425_S,d0		| how about 425s?