diff options
| author | peter <peter@FreeBSD.org> | 2002-02-28 03:07:35 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-02-28 03:07:35 +0000 |
| commit | 0535cd31ee937a1b061f68769b039652136634cb (patch) | |
| tree | fc9caab6f92082636777e93202a93015cabaad00 /sys | |
| parent | 821d20af411cb7f718738e0437d7c1c7f2574aa6 (diff) | |
| download | FreeBSD-src-0535cd31ee937a1b061f68769b039652136634cb.zip FreeBSD-src-0535cd31ee937a1b061f68769b039652136634cb.tar.gz | |
Fix warnings.. bootpc_init() and related.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 7 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 7 | ||||
| -rw-r--r-- | sys/nfsclient/bootp_subr.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfsdiskless.h | 1 |
4 files changed, 5 insertions, 12 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index a816eed..618b2c6 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -95,7 +95,7 @@ static void configure_first __P((void *)); static void configure __P((void *)); static void configure_final __P((void *)); -#if defined(NFSCLIENT) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) static void pxe_setup_nfsdiskless(void); #endif @@ -219,9 +219,6 @@ configure_final(dummy) cold = 0; } -#ifdef BOOTP -extern void bootpc_init(void); -#endif /* * Do legacy root filesystem discovery. */ @@ -243,7 +240,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(NFSCLIENT) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) static int inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa) diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index a816eed..618b2c6 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -95,7 +95,7 @@ static void configure_first __P((void *)); static void configure __P((void *)); static void configure_final __P((void *)); -#if defined(NFSCLIENT) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) static void pxe_setup_nfsdiskless(void); #endif @@ -219,9 +219,6 @@ configure_final(dummy) cold = 0; } -#ifdef BOOTP -extern void bootpc_init(void); -#endif /* * Do legacy root filesystem discovery. */ @@ -243,7 +240,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(NFSCLIENT) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) static int inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa) diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index 3bae16a..27a5877 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -262,8 +262,6 @@ static __inline int bootpc_ifctx_isresolved(struct bootpc_ifcontext *ifctx); static __inline int bootpc_ifctx_isunresolved(struct bootpc_ifcontext *ifctx); static __inline int bootpc_ifctx_isfailed(struct bootpc_ifcontext *ifctx); -void bootpc_init(void); - /* * In order to have multiple active interfaces with address 0.0.0.0 * and be able to send data to a selected interface, we perform diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h index 9b74d5c..1c7a694 100644 --- a/sys/nfsclient/nfsdiskless.h +++ b/sys/nfsclient/nfsdiskless.h @@ -124,6 +124,7 @@ struct nfs_diskless { extern struct nfsv3_diskless nfsv3_diskless; extern struct nfs_diskless nfs_diskless; extern int nfs_diskless_valid; +void bootpc_init(void); #endif #endif |
