diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-06-28 17:36:18 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2014-06-28 17:36:18 +0000 |
| commit | 4813ad54f87e014a4f7385034f1914ff1bf13cd0 (patch) | |
| tree | 18fba3aca427d54d02ce37f14aa4b01b1f2547fa /sys/ofed | |
| parent | a88289fcb9ef8ffd596cf5a411abd17370698cd0 (diff) | |
| download | src-4813ad54f87e014a4f7385034f1914ff1bf13cd0.tar.gz src-4813ad54f87e014a4f7385034f1914ff1bf13cd0.zip | |
Compile fixes:
Remove duplicate "debug_ktr.mask" sysctl definition.
Remove now unused variable from "kern_ktr.c".
This fixes build of "ktr" which was broken by r267961.
Let the default value for "vm_kmem_size_scale" be zero. It is setup
after that the sysctl has been initialized from "getenv()" in the
"kmeminit()" function to equal the "VM_KMEM_SIZE_MAX" value, if
zero. On Sparc64 the "VM_KMEM_SIZE_MAX" macro is not a constant. This
fixes build of Sparc64 which was broken by r267961.
Add a special macro to dynamically create SYSCTL root nodes, because
root nodes have a special parent. This fixes build of existing OFED
module and CANBUS module for pc98 which was broken by r267961.
Add missing "sysctl.h" includes to get the needed sysctl header file
declarations. This is needed after r267961.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=268005
Diffstat (limited to 'sys/ofed')
| -rw-r--r-- | sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c | 1 | ||||
| -rw-r--r-- | sys/ofed/drivers/net/mlx4/en_netdev.c | 1 | ||||
| -rw-r--r-- | sys/ofed/include/linux/linux_compat.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c index f02c3335d45d..910424dd768d 100644 --- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> #include <net/vnet.h> +#include <sys/sysctl.h> uma_zone_t sdp_zone; struct rwlock sdp_lock; diff --git a/sys/ofed/drivers/net/mlx4/en_netdev.c b/sys/ofed/drivers/net/mlx4/en_netdev.c index a992ae97599d..97dd5b2d2e6c 100644 --- a/sys/ofed/drivers/net/mlx4/en_netdev.c +++ b/sys/ofed/drivers/net/mlx4/en_netdev.c @@ -42,6 +42,7 @@ #include <net/ethernet.h> #include <net/if_vlan_var.h> #include <sys/sockio.h> +#include <sys/sysctl.h> static void mlx4_en_init_locked(struct mlx4_en_priv *priv); static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv); diff --git a/sys/ofed/include/linux/linux_compat.c b/sys/ofed/include/linux/linux_compat.c index 80d1e1e8cf1f..01c95e8884e8 100644 --- a/sys/ofed/include/linux/linux_compat.c +++ b/sys/ofed/include/linux/linux_compat.c @@ -678,7 +678,7 @@ linux_compat_init(void) struct sysctl_oid *rootoid; int i; - rootoid = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(), + rootoid = SYSCTL_ADD_ROOT_NODE(NULL, OID_AUTO, "sys", CTLFLAG_RD|CTLFLAG_MPSAFE, NULL, "sys"); kobject_init(&class_root, &class_ktype); kobject_set_name(&class_root, "class"); |