#define DEBUG_SUBSYSTEM S_LND
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
#include <lnet/lnet.h>
#include <lnet/lib-lnet.h>
#if IBNAL_USE_FMR
int *kib_fmr_remaps; /* # FMR maps before unmap required */
#endif
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
- struct ctl_table_header *kib_sysctl; /* sysctl interface */
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
+ cfs_sysctl_table_header_t *kib_sysctl; /* sysctl interface */
#endif
} kib_tunables_t;
#endif
#if IBNAL_VOIDSTAR_SGADDR
-# if CONFIG_HIGHMEM
-# if CONFIG_X86 && CONFIG_HIGHMEM4G
+# if defined(CONFIG_HIGHMEM)
+# if defined(CONFIG_X86) && defined(CONFIG_HIGHMEM4G)
/* truncation to void* doesn't matter if 0 <= physmem < 4G
* so allow x86 with 32 bit phys addrs */
-# elif CONFIG_IA64
+# elif defined(CONFIG_IA64)
/* OK anyway on 64-bit arch */
# else
# error "Can't support HIGHMEM when vv_scatgat_t::v_address is void *"