From 164d41fd51b544f8097dbab3141d56a587d6b312 Mon Sep 17 00:00:00 2001
From: visa <visa@openbsd.org>
Date: Fri, 28 May 2021 16:33:36 +0000
Subject: [PATCH] Remove CPU and node id fields that were used with SGI Origin.

---
 sys/arch/mips64/include/cpu.h | 7 +------
 sys/arch/mips64/mips64/cpu.c  | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index d439074e73d..dd59c88161a 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.132 2021/05/05 15:29:19 visa Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.133 2021/05/28 16:33:36 visa Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -183,11 +183,6 @@ struct cpu_info {
 
 	u_int32_t	ci_pendingticks;
 
-#ifdef TGT_ORIGIN
-	u_int16_t	ci_nasid;
-	u_int16_t	ci_slice;
-#endif
-
 	struct pmap	*ci_curpmap;
 	uint		ci_intrdepth;		/* interrupt depth */
 #ifdef MULTIPROCESSOR
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c
index 0ac501e49ad..2d1998c1165 100644
--- a/sys/arch/mips64/mips64/cpu.c
+++ b/sys/arch/mips64/mips64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.78 2021/05/01 16:11:11 visa Exp $ */
+/*	$OpenBSD: cpu.c,v 1.79 2021/05/28 16:33:36 visa Exp $ */
 
 /*
  * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se)
@@ -127,11 +127,6 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
 	}
 #endif
 
-#ifdef TGT_ORIGIN
-	ci->ci_nasid = caa->caa_maa.maa_nasid;
-	ci->ci_slice = caa->caa_maa.maa_physid;
-#endif
-
 	printf(": ");
 
 	displayver = 1;
-- 
2.20.1