From 9522cf08d449d64f291134259bab64633e277e36 Mon Sep 17 00:00:00 2001
From: chris <chris@NetBSD.org>
Date: Sun, 5 Aug 2001 13:09:45 +0000
Subject: [PATCH] Share procfs_machdep.c across arm.

---
 sys/arch/arm/{arm32 => arm}/procfs_machdep.c |  2 +-
 sys/arch/arm/conf/files.arm                  |  4 ++--
 sys/arch/arm26/arm26/procfs_machdep.c        | 20 --------------------
 sys/arch/arm26/conf/files.arm26              |  4 ++--
 4 files changed, 5 insertions(+), 25 deletions(-)
 rename sys/arch/arm/{arm32 => arm}/procfs_machdep.c (82%)
 delete mode 100644 sys/arch/arm26/arm26/procfs_machdep.c

diff --git a/sys/arch/arm/arm32/procfs_machdep.c b/sys/arch/arm/arm/procfs_machdep.c
similarity index 82%
rename from sys/arch/arm/arm32/procfs_machdep.c
rename to sys/arch/arm/arm/procfs_machdep.c
index 6d9f43470131..222dfc334c54 100644
--- a/sys/arch/arm/arm32/procfs_machdep.c
+++ b/sys/arch/arm/arm/procfs_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_machdep.c,v 1.1 2001/07/28 13:28:03 chris Exp $	*/
+/*	$NetBSD: procfs_machdep.c,v 1.1 2001/08/05 13:09:45 chris Exp $	*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 974a3185eabb..e354df6b807c 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.36 2001/07/31 17:00:24 matt Exp $
+#	$NetBSD: files.arm,v 1.37 2001/08/05 13:09:47 chris Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defopt	ARM32
@@ -52,6 +52,7 @@ file	arch/arm/arm/compat_13_machdep.c	compat_13
 file	arch/arm/arm/cpufunc.c
 file	arch/arm/arm/cpufunc_asm.S
 file	arch/arm/arm/process_machdep.c
+file	arch/arm/arm/procfs_machdep.c		procfs
 file	arch/arm/arm/sig_machdep.c
 file	arch/arm/arm/sigcode.S
 file	arch/arm/arm/undefined.c
@@ -69,7 +70,6 @@ file	arch/arm/arm32/fusu.S			arm32
 file	arch/arm/arm32/intr.c			arm32
 file	arch/arm/arm32/mem.c			arm32
 file	arch/arm/arm32/pmap.c			arm32
-file	arch/arm/arm32/procfs_machdep.c		arm32 & procfs
 file	arch/arm/arm32/setcpsr.S		arm32
 file	arch/arm/arm32/setstack.S		arm32
 file	arch/arm/arm32/spl.S			arm32
diff --git a/sys/arch/arm26/arm26/procfs_machdep.c b/sys/arch/arm26/arm26/procfs_machdep.c
deleted file mode 100644
index c07977f3d51a..000000000000
--- a/sys/arch/arm26/arm26/procfs_machdep.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: procfs_machdep.c,v 1.1 2001/01/17 00:07:20 fvdl Exp $	*/
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
-#include <miscfs/procfs/procfs.h>
-
-
-/*
- * Linux-style /proc/cpuinfo.
- * Only used when procfs is mounted with -o linux.
- */
-int
-procfs_getcpuinfstr(char *buf, int *len)
-{
-	*len = 0;
-
-	return 0;
-}
diff --git a/sys/arch/arm26/conf/files.arm26 b/sys/arch/arm26/conf/files.arm26
index 1b9842987322..1f6ebec90448 100644
--- a/sys/arch/arm26/conf/files.arm26
+++ b/sys/arch/arm26/conf/files.arm26
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm26,v 1.34 2001/07/28 19:12:51 bjh21 Exp $
+# $NetBSD: files.arm26,v 1.35 2001/08/05 13:09:48 chris Exp $
 
 # Copyright (c) 1997, 1998, 2000 Ben Harris
 # All rights reserved.
@@ -206,7 +206,7 @@ file	arch/arm26/arm26/Locore.c
 file	arch/arm26/arm26/machdep.c
 file	arch/arm26/arm26/mem.c
 file	arch/arm26/arm26/pmap.c
-file	arch/arm26/arm26/procfs_machdep.c	procfs
+file	arch/arm/arm/procfs_machdep.c		procfs
 #file	arch/arm26/arm26/rscons.c
 file 	arch/arm26/arm26/softintr.c
 file	arch/arm26/arm26/stubs.c