aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Macklem <rmacklem@FreeBSD.org>2017-06-18 12:28:43 +0000
committerRick Macklem <rmacklem@FreeBSD.org>2017-06-18 12:28:43 +0000
commit1d9f01b18e383de633e4758dcf22cc6ecb16c7e3 (patch)
treeda4ca1c386af9f2ae3e885a657dd8dc532c61d25
parentdbaa9ebf1bea94cbec7721db1f15eb48747cdc1a (diff)
downloadsrc-1d9f01b18e383de633e4758dcf22cc6ecb16c7e3.tar.gz
src-1d9f01b18e383de633e4758dcf22cc6ecb16c7e3.zip
Take "extern int maxbcachebuf" out of sys/param.h, since it breaks the
arm build. In the arm build, elf_note.S includes sys/param.h and then does an elf macro called ELFNOTE(). Although the compile error doesn't make sense to me, I believe it just means that an "extern ..." can't exist in param.h for this inclusion case. I suspect adding #if !defined(LOCORE) might fix the build, but this commit just takes the definition out. I will ask freebsd-current@ what is the best was to deal with this and do a subsequent commit after that. Reported by: melounmichal@gmail.com
Notes
Notes: svn path=/head/; revision=320070
-rw-r--r--sys/fs/nfs/nfs_commonkrpc.c1
-rw-r--r--sys/fs/nfsclient/nfs_clvfsops.c1
-rw-r--r--sys/sys/param.h8
3 files changed, 2 insertions, 8 deletions
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index b2c396254de2..4307afd6ca7b 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -96,6 +96,7 @@ extern int nfscl_ticks;
extern void (*ncl_call_invalcaches)(struct vnode *);
extern int nfs_numnfscbd;
extern int nfscl_debuglevel;
+extern int maxbcachebuf;
SVCPOOL *nfscbd_pool;
static int nfsrv_gsscallbackson = 0;
diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c
index f1d245661c49..15838827902c 100644
--- a/sys/fs/nfsclient/nfs_clvfsops.c
+++ b/sys/fs/nfsclient/nfs_clvfsops.c
@@ -83,6 +83,7 @@ extern int nfscl_debuglevel;
extern enum nfsiod_state ncl_iodwant[NFS_MAXASYNCDAEMON];
extern struct nfsmount *ncl_iodmount[NFS_MAXASYNCDAEMON];
extern struct mtx ncl_iod_mutex;
+extern int maxbcachebuf;
NFSCLSTATEMUTEX;
MALLOC_DEFINE(M_NEWNFSREQ, "newnfsclient_req", "NFS request header");
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 3c6d5e354c1c..a37243790daf 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -265,14 +265,6 @@
#define BKVAMASK (BKVASIZE-1)
/*
- * This variable is tuned via vfs.maxbcachebuf and is set to the value of
- * MAXBCACHEBUF by default.
- */
-#ifdef _KERNEL
-extern int maxbcachebuf;
-#endif
-
-/*
* MAXPATHLEN defines the longest permissible path length after expanding
* symbolic links. It is used to allocate a temporary buffer from the buffer
* pool in which to do the name expansion, hence should be a power of two,