diff options
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 36 | ||||
| -rw-r--r-- | sys/amd64/amd64/genassym.c | 6 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/amd64/include/md_var.h | 1 |
4 files changed, 23 insertions, 23 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 6c370bd..5b7c42f 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -63,6 +63,20 @@ #include <sys/mount.h> #include <sys/cons.h> +#if defined(NFSCLIENT) && defined(NFS_ROOT) +#include <sys/socket.h> +#include <net/if.h> +#include <net/if_dl.h> +#include <net/if_types.h> +#include <net/if_var.h> +#include <net/ethernet.h> +#include <netinet/in.h> +#include <nfs/rpcv2.h> +#include <nfs/nfsproto.h> +#include <nfsclient/nfs.h> +#include <nfsclient/nfsdiskless.h> +#endif + #include <machine/bootinfo.h> #include <machine/md_var.h> #ifdef APIC_IO @@ -81,7 +95,7 @@ static void configure_first __P((void *)); static void configure __P((void *)); static void configure_final __P((void *)); -#if defined(NFS) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) static void pxe_setup_nfsdiskless(void); #endif @@ -217,7 +231,7 @@ cpu_rootconf() #ifdef BOOTP bootpc_init(); #endif -#if defined(NFS) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) #if !defined(BOOTP_NFSROOT) pxe_setup_nfsdiskless(); if (nfs_diskless_valid) @@ -229,21 +243,7 @@ SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) u_long bootdev = 0; /* not a dev_t - encoding is different */ -#if defined(NFS) && defined(NFS_ROOT) - -#include <sys/socket.h> -#include <net/if.h> -#include <net/if_dl.h> -#include <net/if_types.h> -#include <net/if_var.h> -#include <net/ethernet.h> -#include <netinet/in.h> -#include <nfs/rpcv2.h> -#include <nfs/nfsproto.h> -#include <nfs/nfs.h> -#include <nfs/nfsdiskless.h> - -extern struct nfs_diskless nfs_diskless; +#if defined(NFSCLIENT) && defined(NFS_ROOT) static int inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa) @@ -325,7 +325,7 @@ decode_nfshandle(char *ev, u_char *fh) * boot.nfsroot.nfshandle NFS handle for root filesystem on server */ static void -pxe_setup_nfsdiskless() +pxe_setup_nfsdiskless(void) { struct nfs_diskless *nd = &nfs_diskless; struct ifnet *ifp; diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 8f4be92..ab8a32d 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -65,10 +65,10 @@ #include <sys/user.h> #include <net/if.h> #include <netinet/in.h> -#include <nfs/nfsv2.h> +#include <nfs/nfsproto.h> #include <nfs/rpcv2.h> -#include <nfs/nfs.h> -#include <nfs/nfsdiskless.h> +#include <nfsclient/nfs.h> +#include <nfsclient/nfsdiskless.h> #ifdef SMP #include <machine/apic.h> #endif diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 420dff6..c1bbde2 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -35,7 +35,8 @@ options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options MD_ROOT #MD is a potential root device -options NFS #Network Filesystem +options NFSCLIENT #Network Filesystem Client +options NFSSERVER #Network Filesystem Server options NFS_ROOT #NFS usable as root device, NFS required options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index c3564c2..c2e2aa1 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -55,7 +55,6 @@ extern char kstack[]; extern int need_pre_dma_flush; extern int need_post_dma_flush; #endif -extern int nfs_diskless_valid; extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len)); extern char sigcode[]; extern int szsigcode, szosigcode; |
