[src/trunk]: src/sys/arch Remove unnecessary #ifdef NFS.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5605e6133120
branches:  trunk
changeset: 752649:5605e6133120
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Mar 02 21:17:31 2010 +0000

description:
Remove unnecessary #ifdef NFS.

diffstat:

 sys/arch/hpcarm/hpcarm/hpc_machdep.c |  11 ++---------
 sys/arch/hpcmips/hpcmips/machdep.c   |  11 ++---------
 sys/arch/hpcsh/hpcsh/machdep.c       |  11 ++---------
 3 files changed, 6 insertions(+), 27 deletions(-)

diffs (158 lines):

diff -r 08a7cf6eb03a -r 5605e6133120 sys/arch/hpcarm/hpcarm/hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Tue Mar 02 21:14:43 2010 +0000
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Tue Mar 02 21:17:31 2010 +0000
@@ -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);
diff -r 08a7cf6eb03a -r 5605e6133120 sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Tue Mar 02 21:14:43 2010 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Tue Mar 02 21:17:31 2010 +0000
@@ -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:
diff -r 08a7cf6eb03a -r 5605e6133120 sys/arch/hpcsh/hpcsh/machdep.c
--- a/sys/arch/hpcsh/hpcsh/machdep.c    Tue Mar 02 21:14:43 2010 +0000
+++ b/sys/arch/hpcsh/hpcsh/machdep.c    Tue Mar 02 21:17:31 2010 +0000
@@ -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);