Module Name: src
Committed By: pooka
Date: Tue Mar 2 21:17:31 UTC 2010
Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/hpcsh/hpcsh: machdep.c
Log Message:
Remove unnecessary #ifdef NFS.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/hpcsh/hpcsh/machdep.c
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/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.95 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.96
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.95 Sat Dec 26 16:01:25 2009
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c Tue Mar 2 21:17:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc_machdep.c,v 1.95 2009/12/26 16:01:25 uebayasi Exp $ */
+/* $NetBSD: hpc_machdep.c,v 1.96 2010/03/02 21:17:31 pooka Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,12 +40,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.95 2009/12/26 16:01:25 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.96 2010/03/02 21:17:31 pooka Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
#include "opt_pmap_debug.h"
-#include "fs_nfs.h"
#include "ksyms.h"
#include <sys/param.h>
@@ -91,13 +90,11 @@
#include <dev/hpc/apm/apmvar.h>
#include <dev/hpc/bicons.h>
-#ifdef NFS
#include <sys/mount.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsmount.h>
-#endif /* NFS */
/* Kernel text starts 256K in from the bottom of the kernel address space. */
#define KERNEL_TEXT_BASE (KERNEL_BASE + 0x00040000)
@@ -360,14 +357,10 @@
case 'b':
/* boot device: -b=sd0 etc. */
cp = cp + 2;
-#ifdef NFS
if (strcmp(cp, MOUNT_NFS) == 0)
rootfstype = MOUNT_NFS;
else
strncpy(boot_file, cp, sizeof(boot_file));
-#else /* !NFS */
- strncpy(boot_file, cp, sizeof(boot_file));
-#endif /* !NFS */
break;
default:
BOOT_FLAG(*cp, boothowto);
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.110 src/sys/arch/hpcmips/hpcmips/machdep.c:1.111
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.110 Tue Mar 2 17:28:08 2010
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Tue Mar 2 21:17:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $ */
+/* $NetBSD: machdep.c,v 1.111 2010/03/02 21:17:31 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.110 2010/03/02 17:28:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2010/03/02 21:17:31 pooka Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -119,7 +119,6 @@
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_rtc_offset.h"
-#include "fs_nfs.h"
#include "opt_kloader.h"
#include "opt_kloader_kernel_path.h"
#include "debug_hpc.h"
@@ -179,12 +178,10 @@
#define DPRINTF(arg)
#endif /* NBICONSDEV > 0 */
-#ifdef NFS
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsmount.h>
-#endif
#ifdef MEMORY_DISK_DYNAMIC
#include <dev/md.h>
@@ -413,14 +410,10 @@
case 'b':
/* boot device: -b=sd0 etc. */
-#ifdef NFS
if (strcmp(cp+2, "nfs") == 0)
rootfstype = MOUNT_NFS;
else
makebootdev(cp+2);
-#else /* NFS */
- makebootdev(cp+2);
-#endif /* NFS */
cp += strlen(cp);
break;
default:
Index: src/sys/arch/hpcsh/hpcsh/machdep.c
diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.71 src/sys/arch/hpcsh/hpcsh/machdep.c:1.72
--- src/sys/arch/hpcsh/hpcsh/machdep.c:1.71 Tue Mar 2 17:28:08 2010
+++ src/sys/arch/hpcsh/hpcsh/machdep.c Tue Mar 2 21:17:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $ */
+/* $NetBSD: machdep.c,v 1.72 2010/03/02 21:17:31 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.71 2010/03/02 17:28:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2010/03/02 21:17:31 pooka Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_modular.h"
-#include "fs_nfs.h"
#include "biconsdev.h"
#include "debug_hpc.h"
#include "hd64465if.h"
@@ -97,12 +96,10 @@
#include <machine/autoconf.h> /* makebootdev() */
#include <machine/intr.h>
-#ifdef NFS
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsmount.h>
-#endif
#include <dev/hpc/apm/apmvar.h>
@@ -240,14 +237,10 @@
case 'b':
/* boot device: -b=sd0 etc. */
p = cp + 2;
-#ifdef NFS
if (strcmp(p, "nfs") == 0)
rootfstype = MOUNT_NFS;
else
makebootdev(p);
-#else /* NFS */
- makebootdev(p);
-#endif /* NFS */
break;
default:
BOOT_FLAG(*cp, boothowto);
