Module Name: src
Committed By: pooka
Date: Tue Mar 2 17:28:09 UTC 2010
Modified Files:
src/sys/arch/arc/arc: machdep.c
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/hpcsh/hpcsh: machdep.c
src/sys/arch/landisk/landisk: machdep.c
src/sys/arch/mipsco/mipsco: machdep.c
src/sys/arch/newsmips/newsmips: machdep.c
src/sys/arch/pmax/pmax: machdep.c
src/sys/ufs: files.ufs
Log Message:
Remove fs_mfs.h from users because it is now unnecessary and don't
generate fs_mfs.h anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/hpcsh/hpcsh/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/landisk/landisk/machdep.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.239 -r1.240 src/sys/arch/pmax/pmax/machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/files.ufs
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/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.120 src/sys/arch/arc/arc/machdep.c:1.121
--- src/sys/arch/arc/arc/machdep.c:1.120 Mon Feb 8 19:02:26 2010
+++ src/sys/arch/arc/arc/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.120 2010/02/08 19:02:26 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.121 2010/03/02 17:28:08 pooka Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -78,9 +78,8 @@
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2010/02/08 19:02:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2010/03/02 17:28:08 pooka Exp $");
-#include "fs_mfs.h"
#include "opt_ddb.h"
#include "opt_ddbparam.h"
#include "opt_md.h"
@@ -108,9 +107,7 @@
#include <sys/syscallargs.h>
#include <sys/kcore.h>
#include <sys/ksyms.h>
-#ifdef MFS
#include <ufs/mfs/mfs_extern.h> /* mfs_initminiroot() */
-#endif
#include <machine/bootinfo.h>
#include <machine/cpu.h>
@@ -401,14 +398,12 @@
sprintf(cpu_model, "%s %s%s",
platform->vendor, platform->model, platform->variant);
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
-#endif
#if NKSYMS || defined(DDB) || defined(MODULAR)
/* init symbols if present */
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.109 src/sys/arch/hpcmips/hpcmips/machdep.c:1.110
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.109 Mon Feb 8 19:02:29 2010
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.109 2010/02/08 19:02:29 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2010/02/08 19:02:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -116,7 +116,6 @@
#include "opt_modular.h"
#include "opt_spec_platform.h"
#include "biconsdev.h"
-#include "fs_mfs.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_rtc_offset.h"
@@ -430,7 +429,6 @@
}
}
}
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
@@ -443,7 +441,6 @@
#endif /* MEMORY_DISK_DYNAMIC */
kernend = (char *)kernend + fssz;
}
-#endif /* MFS */
#if NKSYMS || defined(DDB) || defined(MODULAR)
/* init symbols if present */
Index: src/sys/arch/hpcsh/hpcsh/machdep.c
diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.70 src/sys/arch/hpcsh/hpcsh/machdep.c:1.71
--- src/sys/arch/hpcsh/hpcsh/machdep.c:1.70 Fri Nov 27 03:23:09 2009
+++ src/sys/arch/hpcsh/hpcsh/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.70 2009/11/27 03:23:09 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,13 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2009/11/27 03:23:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_modular.h"
-#include "fs_mfs.h"
#include "fs_nfs.h"
#include "biconsdev.h"
#include "debug_hpc.h"
@@ -256,7 +255,6 @@
}
}
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
@@ -269,7 +267,6 @@
#endif
kernend += fssz;
}
-#endif /* MFS */
/* Console */
consinit();
Index: src/sys/arch/landisk/landisk/machdep.c
diff -u src/sys/arch/landisk/landisk/machdep.c:1.13 src/sys/arch/landisk/landisk/machdep.c:1.14
--- src/sys/arch/landisk/landisk/machdep.c:1.13 Fri Nov 27 03:23:10 2009
+++ src/sys/arch/landisk/landisk/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2009/11/27 03:23:10 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2010/03/02 17:28:08 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2009/11/27 03:23:10 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2010/03/02 17:28:08 pooka Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -73,7 +73,6 @@
#include "opt_kloader_kernel_path.h"
#include "opt_memsize.h"
#include "opt_modular.h"
-#include "fs_mfs.h"
#include "ksyms.h"
#include "scif.h"
@@ -196,7 +195,6 @@
/* Initialize console */
consinit();
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
@@ -209,7 +207,6 @@
#endif
kernend += fssz;
}
-#endif /* MFS */
#ifdef KLOADER
/* copy boot parameter for kloader */
Index: src/sys/arch/mipsco/mipsco/machdep.c
diff -u src/sys/arch/mipsco/mipsco/machdep.c:1.71 src/sys/arch/mipsco/mipsco/machdep.c:1.72
--- src/sys/arch/mipsco/mipsco/machdep.c:1.71 Mon Feb 8 19:02:30 2010
+++ src/sys/arch/mipsco/mipsco/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.71 2010/02/08 19:02:30 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.72 2010/03/02 17:28:08 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/02/08 19:02:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2010/03/02 17:28:08 pooka Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -130,7 +130,6 @@
#include <sys/boot_flag.h>
-#include "fs_mfs.h"
#include "opt_execfmt.h"
#include "zsc.h" /* XXX */
@@ -337,14 +336,12 @@
kgdb_connect(0);
#endif
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
-#endif
/*
* Load the rest of the available pages into the VM system.
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.108 src/sys/arch/newsmips/newsmips/machdep.c:1.109
--- src/sys/arch/newsmips/newsmips/machdep.c:1.108 Mon Feb 8 19:02:30 2010
+++ src/sys/arch/newsmips/newsmips/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.108 2010/02/08 19:02:30 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.109 2010/03/02 17:28:08 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,11 +76,10 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2010/02/08 19:02:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2010/03/02 17:28:08 pooka Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
-#include "fs_mfs.h"
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_modular.h"
@@ -345,14 +344,12 @@
boothowto |= RB_KDB;
#endif
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
-#endif
/*
* Load the rest of the available pages into the VM system.
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.239 src/sys/arch/pmax/pmax/machdep.c:1.240
--- src/sys/arch/pmax/pmax/machdep.c:1.239 Mon Feb 8 19:02:31 2010
+++ src/sys/arch/pmax/pmax/machdep.c Tue Mar 2 17:28:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.239 2010/02/08 19:02:31 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.240 2010/03/02 17:28:08 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,9 +77,8 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.239 2010/02/08 19:02:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.240 2010/03/02 17:28:08 pooka Exp $");
-#include "fs_mfs.h"
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -335,14 +334,12 @@
}
}
-#ifdef MFS
/*
* Check to see if a mini-root was loaded into memory. It resides
* at the start of the next page just after the end of BSS.
*/
if (boothowto & RB_MINIROOT)
kernend += round_page(mfs_initminiroot(kernend));
-#endif
#if NKSYMS || defined(DDB) || defined(MODULAR)
/* init symbols if present */
Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.22 src/sys/ufs/files.ufs:1.23
--- src/sys/ufs/files.ufs:1.22 Tue Mar 2 17:23:36 2010
+++ src/sys/ufs/files.ufs Tue Mar 2 17:28:09 2010
@@ -1,8 +1,8 @@
-# $NetBSD: files.ufs,v 1.22 2010/03/02 17:23:36 pooka Exp $
+# $NetBSD: files.ufs,v 1.23 2010/03/02 17:28:09 pooka Exp $
deffs FFS
deffs EXT2FS
-deffs fs_mfs.h MFS # XXX
+deffs MFS
deffs fs_lfs.h LFS # XXX
defflag opt_ffs.h FFS_EI FFS_NO_SNAPSHOT APPLE_UFS
