From 92d0498c3d16235db2f2481dd8ec06b0e2d89261 Mon Sep 17 00:00:00 2001 From: matt Date: Wed, 5 Mar 2003 05:43:42 +0000 Subject: [PATCH] Remove port-specific procfs_machdep.c (since they are all identical and a better one resides in powerpc/powerpc/). --- sys/arch/bebox/bebox/procfs_machdep.c | 20 ------------------ sys/arch/bebox/conf/files.bebox | 5 +++-- sys/arch/evbppc/conf/files.evbppc | 4 ++-- sys/arch/evbppc/evbppc/procfs_machdep.c | 21 ------------------- sys/arch/macppc/conf/files.macppc | 5 +++-- sys/arch/macppc/macppc/procfs_machdep.c | 20 ------------------ sys/arch/mvmeppc/conf/files.mvmeppc | 4 ++-- sys/arch/mvmeppc/mvmeppc/procfs_machdep.c | 20 ------------------ sys/arch/ofppc/conf/files.ofppc | 4 ++-- sys/arch/ofppc/ofppc/procfs_machdep.c | 20 ------------------ sys/arch/pmppc/conf/files.pmppc | 5 +++-- sys/arch/pmppc/pmppc/procfs_machdep.c | 20 ------------------ sys/arch/prep/conf/files.prep | 4 ++-- sys/arch/prep/prep/procfs_machdep.c | 20 ------------------ sys/arch/sandpoint/conf/files.sandpoint | 5 +++-- sys/arch/sandpoint/sandpoint/procfs_machdep.c | 20 ------------------ 16 files changed, 20 insertions(+), 177 deletions(-) delete mode 100644 sys/arch/bebox/bebox/procfs_machdep.c delete mode 100644 sys/arch/evbppc/evbppc/procfs_machdep.c delete mode 100644 sys/arch/macppc/macppc/procfs_machdep.c delete mode 100644 sys/arch/mvmeppc/mvmeppc/procfs_machdep.c delete mode 100644 sys/arch/ofppc/ofppc/procfs_machdep.c delete mode 100644 sys/arch/pmppc/pmppc/procfs_machdep.c delete mode 100644 sys/arch/prep/prep/procfs_machdep.c delete mode 100644 sys/arch/sandpoint/sandpoint/procfs_machdep.c diff --git a/sys/arch/bebox/bebox/procfs_machdep.c b/sys/arch/bebox/bebox/procfs_machdep.c deleted file mode 100644 index 8e912e393a9f..000000000000 --- a/sys/arch/bebox/bebox/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.2 2001/01/18 17:47:59 tv Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/bebox/conf/files.bebox b/sys/arch/bebox/conf/files.bebox index 87e274d3e365..619ce8573ce9 100644 --- a/sys/arch/bebox/conf/files.bebox +++ b/sys/arch/bebox/conf/files.bebox @@ -1,4 +1,4 @@ -# $NetBSD: files.bebox,v 1.37 2002/10/30 06:26:42 manu Exp $ +# $NetBSD: files.bebox,v 1.38 2003/03/05 05:43:52 matt Exp $ # # First try for bebox specific configuration info # @@ -12,8 +12,9 @@ file arch/bebox/bebox/clock.c file arch/bebox/bebox/disksubr.c disk file arch/bebox/bebox/extintr.c file arch/bebox/bebox/machdep.c -file arch/bebox/bebox/procfs_machdep.c procfs + file arch/powerpc/powerpc/bus_dma.c +file arch/powerpc/powerpc/procfs_machdep.c procfs # General files file dev/cons.c diff --git a/sys/arch/evbppc/conf/files.evbppc b/sys/arch/evbppc/conf/files.evbppc index ef2d0265b52d..df2dc5d6ea92 100644 --- a/sys/arch/evbppc/conf/files.evbppc +++ b/sys/arch/evbppc/conf/files.evbppc @@ -1,4 +1,4 @@ -# $NetBSD: files.evbppc,v 1.2 2003/03/04 07:50:57 matt Exp $ +# $NetBSD: files.evbppc,v 1.3 2003/03/05 05:43:42 matt Exp $ # maxpartitions must be first item in files.${ARCH} maxpartitions 16 @@ -8,8 +8,8 @@ maxusers 2 8 64 file arch/evbppc/evbppc/bus_dma.c ppc_ibm4xx file arch/evbppc/evbppc/disksubr.c disk file arch/evbppc/evbppc/evbppc_machdep.c ppc_ibm4xx -file arch/evbppc/evbppc/procfs_machdep.c +file arch/powerpc/powerpc/procfs_machdep.c procfs file dev/cons.c include "arch/evbppc/conf/majors.evbppc" diff --git a/sys/arch/evbppc/evbppc/procfs_machdep.c b/sys/arch/evbppc/evbppc/procfs_machdep.c deleted file mode 100644 index 7aa90ae3cf47..000000000000 --- a/sys/arch/evbppc/evbppc/procfs_machdep.c +++ /dev/null @@ -1,21 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.1 2002/12/09 12:15:55 scw Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index d466be2382ec..2a493e7bb17c 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $NetBSD: files.macppc,v 1.56 2003/03/04 13:29:12 soren Exp $ +# $NetBSD: files.macppc,v 1.57 2003/03/05 05:43:43 matt Exp $ # # macppc-specific configuration info @@ -15,8 +15,9 @@ file arch/macppc/macppc/clock.c file arch/macppc/macppc/disksubr.c disk file arch/macppc/macppc/extintr.c file arch/macppc/macppc/machdep.c -file arch/macppc/macppc/procfs_machdep.c procfs file arch/macppc/dev/dbdma.c + +file arch/powerpc/powerpc/procfs_machdep.c procfs file dev/cons.c # diff --git a/sys/arch/macppc/macppc/procfs_machdep.c b/sys/arch/macppc/macppc/procfs_machdep.c deleted file mode 100644 index d69da9636434..000000000000 --- a/sys/arch/macppc/macppc/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.2 2001/01/18 17:48:00 tv Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/mvmeppc/conf/files.mvmeppc b/sys/arch/mvmeppc/conf/files.mvmeppc index 2b2ec77bf5fc..48952ad39e0f 100644 --- a/sys/arch/mvmeppc/conf/files.mvmeppc +++ b/sys/arch/mvmeppc/conf/files.mvmeppc @@ -1,4 +1,4 @@ -# $NetBSD: files.mvmeppc,v 1.5 2002/10/30 06:26:43 manu Exp $ +# $NetBSD: files.mvmeppc,v 1.6 2003/03/05 05:43:44 matt Exp $ # # Motorola's MVMEPPC boards specific configuration info # @@ -19,9 +19,9 @@ file arch/mvmeppc/mvmeppc/extintr.c file arch/mvmeppc/mvmeppc/machdep.c file arch/mvmeppc/mvmeppc/platform.c file arch/mvmeppc/mvmeppc/platform_160x.c support_mvme160x -file arch/mvmeppc/mvmeppc/procfs_machdep.c procfs file arch/powerpc/powerpc/bus_dma.c +file arch/powerpc/powerpc/procfs_machdep.c procfs # General files file dev/cons.c file dev/clock_subr.c diff --git a/sys/arch/mvmeppc/mvmeppc/procfs_machdep.c b/sys/arch/mvmeppc/mvmeppc/procfs_machdep.c deleted file mode 100644 index 8c8341e8b504..000000000000 --- a/sys/arch/mvmeppc/mvmeppc/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.1 2002/02/27 21:02:25 scw Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/ofppc/conf/files.ofppc b/sys/arch/ofppc/conf/files.ofppc index d9122c36ed24..ae28f3ba0e8e 100644 --- a/sys/arch/ofppc/conf/files.ofppc +++ b/sys/arch/ofppc/conf/files.ofppc @@ -1,4 +1,4 @@ -# $NetBSD: files.ofppc,v 1.21 2002/10/30 06:26:43 manu Exp $ +# $NetBSD: files.ofppc,v 1.22 2003/03/05 05:43:44 matt Exp $ # # NetBSD/ofppc configuration info # @@ -20,10 +20,10 @@ file arch/ofppc/ofppc/conf.c file arch/ofppc/ofppc/disksubr.c disk file arch/ofppc/ofppc/machdep.c file arch/ofppc/ofppc/platform.c -file arch/ofppc/ofppc/procfs_machdep.c procfs file dev/cons.c file dev/cninit.c +file arch/powerpc/powerpc/procfs_machdep.c procfs # # CPU specific OpenFirmware code # diff --git a/sys/arch/ofppc/ofppc/procfs_machdep.c b/sys/arch/ofppc/ofppc/procfs_machdep.c deleted file mode 100644 index 74d8e9f89765..000000000000 --- a/sys/arch/ofppc/ofppc/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.2 2001/01/18 17:48:02 tv Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/pmppc/conf/files.pmppc b/sys/arch/pmppc/conf/files.pmppc index ce05c2a20f8b..f7b1f8157a14 100644 --- a/sys/arch/pmppc/conf/files.pmppc +++ b/sys/arch/pmppc/conf/files.pmppc @@ -1,4 +1,4 @@ -# $NetBSD: files.pmppc,v 1.6 2002/10/30 06:26:43 manu Exp $ +# $NetBSD: files.pmppc,v 1.7 2003/03/05 05:43:45 matt Exp $ # # maxpartitions 16 @@ -11,8 +11,9 @@ file arch/pmppc/pmppc/clock.c file arch/pmppc/pmppc/disksubr.c disk file arch/pmppc/pmppc/extintr.c file arch/pmppc/pmppc/machdep.c -file arch/pmppc/pmppc/procfs_machdep.c procfs + file arch/powerpc/powerpc/bus_dma.c +file arch/powerpc/powerpc/procfs_machdep.c procfs # General files file dev/cons.c diff --git a/sys/arch/pmppc/pmppc/procfs_machdep.c b/sys/arch/pmppc/pmppc/procfs_machdep.c deleted file mode 100644 index 2805f6507207..000000000000 --- a/sys/arch/pmppc/pmppc/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.1 2002/05/30 08:51:40 augustss Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/prep/conf/files.prep b/sys/arch/prep/conf/files.prep index 93a44883b792..e55ad2eda378 100644 --- a/sys/arch/prep/conf/files.prep +++ b/sys/arch/prep/conf/files.prep @@ -1,4 +1,4 @@ -# $NetBSD: files.prep,v 1.40 2003/01/16 02:18:20 matt Exp $ +# $NetBSD: files.prep,v 1.41 2003/03/05 05:43:50 matt Exp $ # # prep-specific configuration info # @@ -34,10 +34,10 @@ file arch/prep/prep/consinit.c file arch/prep/prep/disksubr.c disk file arch/prep/prep/extintr.c file arch/prep/prep/machdep.c -file arch/prep/prep/procfs_machdep.c procfs file arch/prep/prep/residual.c residual_data_dump file arch/powerpc/powerpc/bus_dma.c +file arch/powerpc/powerpc/procfs_machdep.c procfs # General files file dev/clock_subr.c diff --git a/sys/arch/prep/prep/procfs_machdep.c b/sys/arch/prep/prep/procfs_machdep.c deleted file mode 100644 index 6fefcd9131c6..000000000000 --- a/sys/arch/prep/prep/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.2 2001/01/18 17:48:03 tv Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * 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/sandpoint/conf/files.sandpoint b/sys/arch/sandpoint/conf/files.sandpoint index f360d54a6a70..448344d6f68d 100644 --- a/sys/arch/sandpoint/conf/files.sandpoint +++ b/sys/arch/sandpoint/conf/files.sandpoint @@ -1,4 +1,4 @@ -# $NetBSD: files.sandpoint,v 1.14 2002/10/30 06:26:44 manu Exp $ +# $NetBSD: files.sandpoint,v 1.15 2003/03/05 05:43:49 matt Exp $ # # Motorola's "SandPoint" evaluation board's specific configuration info # @@ -12,8 +12,9 @@ file arch/sandpoint/sandpoint/clock.c file arch/sandpoint/sandpoint/disksubr.c disk file arch/sandpoint/sandpoint/extintr.c file arch/sandpoint/sandpoint/machdep.c -file arch/sandpoint/sandpoint/procfs_machdep.c procfs + file arch/powerpc/powerpc/bus_dma.c +file arch/powerpc/powerpc/procfs_machdep.c procfs # General files file dev/cons.c diff --git a/sys/arch/sandpoint/sandpoint/procfs_machdep.c b/sys/arch/sandpoint/sandpoint/procfs_machdep.c deleted file mode 100644 index 14e4e9370a1a..000000000000 --- a/sys/arch/sandpoint/sandpoint/procfs_machdep.c +++ /dev/null @@ -1,20 +0,0 @@ -/* $NetBSD: procfs_machdep.c,v 1.1 2001/02/04 18:32:18 briggs Exp $ */ - -#include -#include -#include -#include -#include - - -/* - * Linux-style /proc/cpuinfo. - * Only used when procfs is mounted with -o linux. - */ -int -procfs_getcpuinfstr(char *buf, int *len) -{ - *len = 0; - - return 0; -}