X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=312542dad3956c61771c1a818c19c03307b027c5;hp=c09767aed7bd8266daec16758799732fdee1f41a;hb=3842b448082eb29b14e7e55e1bddc0a509bf2ba1;hpb=40e312a8275ed9240e63f0ac023d8b7a38136f42 diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index c09767a..312542d 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -59,61 +59,6 @@ else fi ]) -# -# LIBCFS_FUNC_CPU_ONLINE -# -# cpu_online is different in rh 2.4, vanilla 2.4, and 2.6 -# -AC_DEFUN([LIBCFS_FUNC_CPU_ONLINE], -[AC_MSG_CHECKING([if kernel defines cpu_online()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - cpu_online(0); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CPU_ONLINE, 1, [cpu_online found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LIBCFS_TYPE_GFP_T -# -# check if gfp_t is typedef-ed -# -AC_DEFUN([LIBCFS_TYPE_GFP_T], -[AC_MSG_CHECKING([if kernel defines gfp_t]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return sizeof(gfp_t); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_GFP_T, 1, [gfp_t found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LIBCFS_FUNC_SHOW_TASK -# -# we export show_task(), but not all kernels have it (yet) -# -AC_DEFUN([LIBCFS_FUNC_SHOW_TASK], -[LB_CHECK_SYMBOL_EXPORT([show_task], -[kernel/ksyms.c kernel/sched.c],[ -AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported]) -],[ - LB_CHECK_SYMBOL_EXPORT([sched_show_task], - [kernel/ksyms.c kernel/sched.c],[ - AC_DEFINE(HAVE_SCHED_SHOW_TASK, 1, [sched_show_task is exported]) - ],[]) -]) -]) - # check kernel __u64 type AC_DEFUN([LIBCFS_U64_LONG_LONG_LINUX], [ @@ -124,10 +69,9 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - unsigned long long *data1; - __u64 *data2 = NULL; + unsigned long long *data; - data1 = data2; + data = (__u64*)sizeof(data); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_KERN__U64_LONG_LONG, 1, @@ -138,24 +82,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# check if task_struct with rcu memeber -AC_DEFUN([LIBCFS_TASK_RCU], -[AC_MSG_CHECKING([if task_struct has a rcu field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct tsk; - - tsk.rcu.next = NULL; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_TASK_RCU, 1, - [task_struct has rcu field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # LIBCFS_TASKLIST_LOCK # 2.6.18 remove tasklist_lock export AC_DEFUN([LIBCFS_TASKLIST_LOCK], @@ -167,6 +93,26 @@ AC_DEFINE(HAVE_TASKLIST_LOCK, 1, ]) ]) +# LIBCFS_DIGEST_SETKEY_FLAGS +# digest_alg.dia_setkey takes 4 args (2.6.18) +# +AC_DEFUN([LIBCFS_DIGEST_SETKEY_FLAGS], +[AC_MSG_CHECKING([if kernel dia_setkey takes 4 args]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct digest_alg alg; + + alg.dia_setkey(NULL, NULL, 0, NULL); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_DIGEST_SETKEY_FLAGS, 1, [kernel dia_setkey takes 4 args]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # 2.6.19 API changes # kmem_cache_destroy(cachep) return void instead of # int @@ -175,7 +121,8 @@ AC_DEFUN([LIBCFS_KMEM_CACHE_DESTROY_INT], LB_LINUX_TRY_COMPILE([ #include ],[ - int i = kmem_cache_destroy(NULL); + int i __attribute__ ((unused)); + i = kmem_cache_destroy(NULL); ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_KMEM_CACHE_DESTROY_INT, 1, @@ -185,70 +132,144 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.19 API change -#panic_notifier_list use atomic_notifier operations -# -AC_DEFUN([LIBCFS_ATOMIC_PANIC_NOTIFIER], -[AC_MSG_CHECKING([panic_notifier_list is atomic]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct atomic_notifier_head panic_notifier_list; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ATOMIC_PANIC_NOTIFIER, 1, - [panic_notifier_list is atomic_notifier_head]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# since 2.6.19 nlmsg_multicast() needs 5 argument. -AC_DEFUN([LIBCFS_NLMSG_MULTICAST], -[AC_MSG_CHECKING([nlmsg_multicast needs 5 argument]) +# check cpumask_size (2.6.28) +AC_DEFUN([LIBCFS_CPUMASK_SIZE], +[AC_MSG_CHECKING([whether have cpumask_size()]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - nlmsg_multicast(NULL, NULL, 0, 0, 0); + int size = cpumask_size(); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NLMSG_MULTICAST_5ARGS, 1, - [nlmsg_multicast needs 5 argument]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CPUMASK_SIZE, 1, [have cpumask_size()]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(NO) ]) ]) +# check cpu topology functions # -# LIBCFS_NETLINK -# -# If we have netlink.h, and nlmsg_new takes 2 args (2.6.19) -# -AC_DEFUN([LIBCFS_NETLINK], -[AC_MSG_CHECKING([if netlink.h can be compiled]) +# topology_core_cpumask (2.6.29, not on all archs) +# topology_core_siblings (not on all archs) +# topology_thread_cpumask (2.6.29, not on all archs) +# topology_thread_siblings (not on all archs) +# cpumask_of_node/node_to_cpumask (not always exported) +AC_DEFUN([LIBCFS_CPU_TOPOLOGY], +[AC_MSG_CHECKING([whether have topology.h]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_NETLINK, 1, [net/netlink.h found]) - - AC_MSG_CHECKING([if nlmsg_new takes a 2nd argument]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - nlmsg_new(100, GFP_KERNEL); - ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_NETLINK_NL2, 1, [nlmsg_new takes 2 args]) - ],[ - AC_MSG_RESULT([no]) - ]) + AC_DEFINE(HAVE_CPU_TOPOLOGY, 1, [have CPU topology]) + AC_MSG_RESULT(yes) + + AC_MSG_CHECKING([whether have topology_core_cpumask]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_t *mask = topology_core_cpumask(0); + ],[ + AC_DEFINE(HAVE_TOPOLOGY_CORE_CPUMASK, 1, + [have topology_core_cpumask]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + + AC_MSG_CHECKING([whether have topology_core_siblings]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_t mask = topology_core_siblings(0); + ],[ + AC_DEFINE(HAVE_TOPOLOGY_CORE_SIBLINGS, 1, + [have topology_core_siblings]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + + AC_MSG_CHECKING([whether have topology_thread_cpumask]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_t *mask = topology_thread_cpumask(0); + ],[ + AC_DEFINE(HAVE_TOPOLOGY_THREAD_CPUMASK, 1, + [have topology_thread_cpumask]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + + AC_MSG_CHECKING([whether have topology_thread_siblings]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_t mask = topology_thread_siblings(0); + ],[ + AC_DEFINE(HAVE_TOPOLOGY_THREAD_SIBLINGS, 1, + [have topology_thread_siblings]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + + AC_MSG_CHECKING([whether OFED backports have cpumask_of_node]) + # Some OFED has cpumask_of_node backports defined in + # its private include/linux/cpumask.h. However, it is + # defined conflictingly with kernel's cpumask_of_node. + if test -f $OFED_BACKPORT_PATH/linux/cpumask.h; then + grep -q cpumask_of_node $OFED_BACKPORT_PATH/linux/cpumask.h 2>/dev/null + rc=$? + if test $rc -eq 0; then + AC_DEFINE(HAVE_OFED_CPUMASK_OF_NODE, 1, [have cpumask_of_node]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + fi + + AC_MSG_CHECKING([whether have cpumask_of_node]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_t *mask = cpumask_of_node(0); + ],[ + AC_DEFINE(HAVE_CPUMASK_OF_NODE, 1, [have cpumask_of_node]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + + AC_MSG_CHECKING([whether have cpumask_copy]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_copy(NULL, NULL); + ],[ + AC_DEFINE(HAVE_CPUMASK_COPY, 1, [have cpumask_copy]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) + + AC_MSG_CHECKING([whether have node_to_cpumask]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + cpumask_t mask = node_to_cpumask(0); + ],[ + AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1, [have node_to_cpumask]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT(NO) ]) ]) + # 2.6.20 API change INIT_WORK use 2 args and not # store data inside AC_DEFUN([LIBCFS_3ARGS_INIT_WORK], @@ -256,7 +277,7 @@ AC_DEFUN([LIBCFS_3ARGS_INIT_WORK], LB_LINUX_TRY_COMPILE([ #include ],[ - struct work_struct work; + struct work_struct work __attribute__ ((unused)); INIT_WORK(&work, NULL, NULL); ],[ @@ -275,7 +296,7 @@ AC_DEFUN([LIBCFS_2ARGS_REGISTER_SYSCTL], LB_LINUX_TRY_COMPILE([ #include ],[ - return register_sysctl_table(NULL,0); + register_sysctl_table(NULL,0); ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_2ARGS_REGISTER_SYSCTL, 1, @@ -285,29 +306,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.21 marks kmem_cache_t deprecated and uses struct kmem_cache -# instead -AC_DEFUN([LIBCFS_KMEM_CACHE], -[AC_MSG_CHECKING([check kernel has struct kmem_cache]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include - typedef struct kmem_cache cache_t; -],[ - cache_t *cachep = NULL; - - kmem_cache_alloc(cachep, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE, 1, - [kernel has struct kmem_cache]) -],[ - AC_MSG_RESULT(NO) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) - # 2.6.23 lost dtor argument AC_DEFUN([LIBCFS_KMEM_CACHE_CREATE_DTOR], [AC_MSG_CHECKING([check kmem_cache_create has dtor argument]) @@ -324,21 +322,19 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.24 -AC_DEFUN([LIBCFS_NETLINK_CBMUTEX], -[AC_MSG_CHECKING([for mutex in netlink_kernel_create]) +#2.6.23 has new shrinker API +AC_DEFUN([LC_REGISTER_SHRINKER], +[AC_MSG_CHECKING([if kernel has register_shrinker]) LB_LINUX_TRY_COMPILE([ - #include -],[ - struct mutex *lock = NULL; - - netlink_kernel_create(0, 0, NULL, lock, NULL); + #include ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NETLINK_CBMUTEX, 1, - [netlink_kernel_create want mutex for callback]) + register_shrinker(NULL); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_REGISTER_SHRINKER, 1, + [kernel has register_shrinker]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT([no]) ]) ]) @@ -371,68 +367,41 @@ LB_LINUX_TRY_COMPILE([ ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SCATTERLIST_SETPAGE, 1, - [struct scatterlist has page member]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.24 -AC_DEFUN([LIBCFS_NETWORK_NAMESPACE], -[AC_MSG_CHECKING([for network stack has namespaces]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct net *net = &init_net; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INIT_NET, 1, - [kernel is support network namespaces ]) + [struct scatterlist has no page member]) ],[ AC_MSG_RESULT(NO) ]) ]) - -# 2.6.24 -AC_DEFUN([LIBCFS_NETLINK_NETNS], -[AC_MSG_CHECKING([for netlink support net ns]) +# 2.6.24-rc1 sg_init_table +AC_DEFUN([LIBCFS_SCATTERLIST_INITTABLE], +[AC_MSG_CHECKING([for sg_init_table]) LB_LINUX_TRY_COMPILE([ - #include + #include + #include ],[ - struct net *net = NULL; - struct mutex *lock = NULL; - - netlink_kernel_create(net, 0, 0, NULL, - lock, - NULL); + sg_init_table(NULL,0); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NETLINK_NS, 1, - [netlink is support network namespace]) -# XXX -# for now - if kernel have netlink ns - he uses cbmutex - AC_DEFINE(HAVE_NETLINK_CBMUTEX, 1, - [netlink_kernel_create want mutex for callback]) - + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SCATTERLIST_INITTABLE, 1, + [scatterlist has sg_init_table]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(NO) ]) ]) -# ~2.6.24 -AC_DEFUN([LIBCFS_NL_BROADCAST_GFP], -[AC_MSG_CHECKING([for netlink_broadcast is want to have gfp parameter]) +# 2.6.24 +AC_DEFUN([LIBCFS_NETWORK_NAMESPACE], +[AC_MSG_CHECKING([for network stack has namespaces]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - gfp_t gfp = GFP_KERNEL; - - netlink_broadcast(NULL, NULL, 0, 0, gfp); + struct net *net __attribute__ ((unused)); + net = &init_net; ],[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NL_BROADCAST_GFP, 1, - [netlink brouacast is want to have gfp paramter]) + AC_DEFINE(HAVE_INIT_NET, 1, + [kernel is support network namespaces ]) ],[ AC_MSG_RESULT(NO) ]) @@ -466,12 +435,9 @@ AC_DEFUN([LIBCFS_FUNC_DUMP_TRACE], LB_LINUX_TRY_COMPILE([ struct task_struct; struct pt_regs; - void print_addr(void *data, unsigned long addr, int reliable); #include ],[ - struct stacktrace_ops ops; - - ops.address = print_addr; + ((struct stacktrace_ops *)0)->address(NULL, 0, 0); ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_TRACE_ADDRESS_RELIABLE, 1, @@ -480,6 +446,36 @@ AC_DEFUN([LIBCFS_FUNC_DUMP_TRACE], AC_MSG_RESULT(no) ],[ ]) + AC_MSG_CHECKING([whether stacktrace_ops.warning is exist]) + LB_LINUX_TRY_COMPILE([ + struct task_struct; + struct pt_regs; + #include + ],[ + ((struct stacktrace_ops *)0)->warning(NULL, NULL); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STACKTRACE_WARNING, 1, [stacktrace_ops.warning is exist]) + ],[ + AC_MSG_RESULT(no) + ],[ + ]) + AC_MSG_CHECKING([dump_trace want address]) + LB_LINUX_TRY_COMPILE([ + struct task_struct; + struct pt_regs; + #include + ],[ + dump_trace(NULL, NULL, NULL, 0, NULL, NULL); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_DUMP_TRACE_ADDRESS, 1, + [dump_trace want address argument]) + ],[ + AC_MSG_RESULT(no) + ],[ + ]) + EXTRA_KCFLAGS="$tmp_flags" ]) ]) @@ -491,8 +487,8 @@ AC_DEFUN([LIBCFS_SEM_COUNT], LB_LINUX_TRY_COMPILE([ #include ],[ - struct semaphore s; - + struct semaphore s __attribute__ ((unused)); + atomic_read(&s.count); ],[ AC_MSG_RESULT(yes) @@ -530,7 +526,7 @@ LB_LINUX_TRY_COMPILE([ ],[ uid_t uid; - uid = current_uid(); + uid = current_uid() + sizeof(uid); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_CRED_WRAPPERS, 1, [task's cred wrappers found]) @@ -559,6 +555,25 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# LIBCFS_STRUCT_SHASH_ALG +# struct shash_alg was introduced in 2.6.29 +# +AC_DEFUN([LIBCFS_STRUCT_SHASH_ALG], +[AC_MSG_CHECKING([if kernel has struct shash_alg]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct shash_alg foo; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_SHASH_ALG, 1, [kernel has struct shash_alg]) +],[ + AC_MSG_RESULT([no]) +]) +]) + + # # LIBCFS_FUNC_UNSHARE_FS_STRUCT # @@ -594,7 +609,8 @@ AC_DEFUN([LIBCFS_HAVE_IS_COMPAT_TASK], LB_LINUX_TRY_COMPILE([ #include ],[ - int i = is_compat_task(); + int i __attribute__ ((unused)); + i = is_compat_task(); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_IS_COMPAT_TASK, 1, [is_compat_task() is available]) @@ -612,17 +628,8 @@ AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], [AC_MSG_CHECKING([if 'struct stacktrace_ops' has 'walk_stack' field]) LB_LINUX_TRY_COMPILE([ #include - unsigned long walkstack(struct thread_info *tinfo, - unsigned long *stack, - unsigned long bp, - const struct stacktrace_ops *ops, - void *data, - unsigned long *end, - int *graph); ],[ - struct stacktrace_ops ops; - - ops.walk_stack = walkstack; + ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, ['struct stacktrace_ops' has 'walk_stack' field]) @@ -631,6 +638,100 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +AC_DEFUN([LIBCFS_HAVE_OOM_H], +[LB_CHECK_FILE([$LINUX/include/linux/oom.h], [ + AC_DEFINE(HAVE_LINUX_OOM_H, 1, + [kernel has include/oom.h]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +AC_DEFUN([LIBCFS_HAVE_KEYTYPE_H], +[LB_CHECK_FILE([$LINUX/include/linux/key-type.h], [ + AC_DEFINE(HAVE_LINUX_KEYTYPE_H, 1, + [kernel has include/key-type.h]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# check set_mems_allowed +# 2.6.31 adds function set_mems_allowed in cpuset.h +# +AC_DEFUN([LIBCFS_HAVE_SET_MEMS_ALLOWED], +[AC_MSG_CHECKING([whether have set_mems_allowed()]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + nodemask_t mask; + + set_mems_allowed(mask); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SET_MEMS_ALLOWED, 1, [have set_mems_allowed()]) +],[ + AC_MSG_RESULT(NO) +]) +]) + + +# +# RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function +# +AC_DEFUN([LC_SHRINKER_WANT_SHRINK_PTR], +[AC_MSG_CHECKING([shrinker want self pointer in handler]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct shrinker *tmp = NULL; + tmp->shrink(tmp, 0, 0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SHRINKER_WANT_SHRINK_PTR, 1, + [shrinker want self pointer in handler]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# 2.6.18 store oom parameters in task struct. +# 2.6.32 store oom parameters in signal struct +AC_DEFUN([LIBCFS_OOMADJ_IN_SIG], +[AC_MSG_CHECKING([kernel store oom parameters in task]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct signal_struct *)0)->oom_adj = 0; +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_OOMADJ_IN_SIG, 1, + [kernel store a oom parameters in signal struct]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# +# 2.6.33 no longer has ctl_name & strategy field in struct ctl_table. +# +AC_DEFUN([LIBCFS_SYSCTL_CTLNAME], +[AC_MSG_CHECKING([if ctl_table has a ctl_name field]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct ctl_table ct; + ct.ctl_name = sizeof(ct); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1, + [ctl_table has ctl_name field]) +],[ + AC_MSG_RESULT(no) +]) +]) + # # LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE # @@ -655,55 +756,100 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 2.6.35 kernel has sk_sleep function +# +AC_DEFUN([LC_SK_SLEEP], +[AC_MSG_CHECKING([if kernel has sk_sleep]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + sk_sleep(NULL); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SK_SLEEP, 1, [kernel has sk_sleep]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# +# FC15 2.6.40-5 backported the "shrink_control" parameter to the memory +# pressure shrinker from Linux 3.0 +# +AC_DEFUN([LC_SHRINK_CONTROL], +[AC_MSG_CHECKING([shrink_control is present]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct shrink_control tmp = {0}; + tmp.nr_to_scan = sizeof(tmp); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SHRINK_CONTROL, 1, + [shrink_control is present]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# # LIBCFS_PROG_LINUX # # LNet linux kernel checks # AC_DEFUN([LIBCFS_PROG_LINUX], [ -LIBCFS_FUNC_CPU_ONLINE -LIBCFS_TYPE_GFP_T LIBCFS_CONFIG_PANIC_DUMPLOG -LIBCFS_FUNC_SHOW_TASK LIBCFS_U64_LONG_LONG_LINUX -LIBCFS_TASK_RCU # 2.6.18 LIBCFS_TASKLIST_LOCK LIBCFS_HAVE_IS_COMPAT_TASK +LIBCFS_DIGEST_SETKEY_FLAGS # 2.6.19 -LIBCFS_NETLINK -LIBCFS_NLMSG_MULTICAST LIBCFS_KMEM_CACHE_DESTROY_INT -LIBCFS_ATOMIC_PANIC_NOTIFIER # 2.6.20 LIBCFS_3ARGS_INIT_WORK # 2.6.21 LIBCFS_2ARGS_REGISTER_SYSCTL -LIBCFS_KMEM_CACHE # 2.6.23 LIBCFS_KMEM_CACHE_CREATE_DTOR -LIBCFS_NETLINK_CBMUTEX +LC_REGISTER_SHRINKER # 2.6.24 LIBCFS_SYSCTL_UNNUMBERED LIBCFS_SCATTERLIST_SETPAGE -LIBCFS_NL_BROADCAST_GFP +LIBCFS_SCATTERLIST_INITTABLE LIBCFS_NETWORK_NAMESPACE -LIBCFS_NETLINK_NETNS LIBCFS_FUNC_DUMP_TRACE +LIBCFS_HAVE_KEYTYPE_H # 2.6.26 LIBCFS_SEM_COUNT # 2.6.27 LIBCFS_CRED_WRAPPERS +# 2.6.28 +LIBCFS_CPUMASK_SIZE # 2.6.29 LIBCFS_STRUCT_CRED_IN_TASK +LIBCFS_CPU_TOPOLOGY +LIBCFS_STRUCT_SHASH_ALG # 2.6.30 LIBCFS_FUNC_UNSHARE_FS_STRUCT LIBCFS_SOCK_MAP_FD_2ARG +# 2.6.31 +LIBCFS_HAVE_SET_MEMS_ALLOWED # 2.6.32 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +LC_SHRINKER_WANT_SHRINK_PTR +LIBCFS_HAVE_OOM_H +LIBCFS_OOMADJ_IN_SIG +# 2.6.33 +LIBCFS_SYSCTL_CTLNAME # 2.6.34 LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE +# 2.6.35 +LC_SK_SLEEP +# 2.6.40 fc15 +LC_SHRINK_CONTROL ]) # @@ -744,6 +890,12 @@ AC_CHECK_TYPE([spinlock_t], # lnet/utils/wirecheck.c AC_CHECK_FUNCS([strnlen]) +# lnet/libcfs/user-prim.c, missing for RHEL5 and earlier userspace +AC_CHECK_FUNCS([strlcpy]) + +# libcfs/libcfs/user-prim.c, missing for RHEL5 and earlier userspace +AC_CHECK_FUNCS([strlcat]) + AC_CHECK_TYPE([umode_t], [AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])], [], @@ -802,6 +954,7 @@ AC_COMPILE_IFELSE([ __u64 *data2 = NULL; data1 = data2; + data2 = data1; return 0; } ],[