X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Fautoconf%2Flustre-libcfs.m4;h=654aa9d4fffa1b95122863431b194a94bbe232a5;hb=9dac1488397c9acbfd58603c5125b272646544fc;hp=5d063ed9592f92e7eaa77a835066ce877ed98451;hpb=6dbf1ffdec1240fbc8a86210b439d31a6c80c8de;p=fs%2Flustre-release.git diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 5d063ed..654aa9d 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -59,139 +59,9 @@ else fi ]) -# -# LIBCFS_STRUCT_PAGE_LIST -# -# 2.6.4 no longer has page->list -# -AC_DEFUN([LIBCFS_STRUCT_PAGE_LIST], -[AC_MSG_CHECKING([if struct page has a list field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct page page; - &page.list; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PAGE_LIST, 1, [struct page has a list field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LIBCFS_STRUCT_SIGHAND -# -# red hat 2.4 adds sighand to struct task_struct -# -AC_DEFUN([LIBCFS_STRUCT_SIGHAND], -[AC_MSG_CHECKING([if task_struct has a sighand field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct p; - p.sighand = NULL; -],[ - AC_DEFINE(CONFIG_RH_2_4_20, 1, [this kernel contains Red Hat 2.4.20 patches]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 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_TYPE_CPUMASK_T -# -# same goes for cpumask_t -# -AC_DEFUN([LIBCFS_TYPE_CPUMASK_T], -[AC_MSG_CHECKING([if kernel defines cpumask_t]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return sizeof (cpumask_t); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CPUMASK_T, 1, [cpumask_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]) -],[ -]) -]) - -# check userland & kernel __u64 type -AC_DEFUN([LIBCFS_U64_LONG_LONG], -[AC_MSG_CHECKING([u64 is long long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - unsigned long long *data1; - __u64 *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_USER__U64_LONG_LONG, 1, - [__u64 is long long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" +# check kernel __u64 type +AC_DEFUN([LIBCFS_U64_LONG_LONG_LINUX], +[ AC_MSG_CHECKING([kernel __u64 is long long type]) tmp_flags="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror" @@ -199,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, @@ -213,257 +82,18 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# check userland size_t type -AC_DEFUN([LIBCFS_SIZE_T_LONG], -[AC_MSG_CHECKING([size_t is unsigned long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - unsigned long *data1; - size_t *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SIZE_T_LONG, 1, - [size_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$tmp_flags" -]) - -AC_DEFUN([LIBCFS_SSIZE_T_LONG], -[AC_MSG_CHECKING([ssize_t is signed long type]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -Werror" -AC_COMPILE_IFELSE([ - #include - #include - int main(void) { - long *data1; - ssize_t *data2 = NULL; - - data1 = data2; - return 0; - } -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SSIZE_T_LONG, 1, - [ssize_t is long type]) -],[ - AC_MSG_RESULT([no]) -]) -CFLAGS="$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], -[LB_CHECK_SYMBOL_EXPORT([tasklist_lock], -[kernel/fork.c],[ -AC_DEFINE(HAVE_TASKLIST_LOCK, 1, - [tasklist_lock exported]) -],[ -]) -]) - -# 2.6.19 API changes -# kmem_cache_destroy(cachep) return void instead of -# int -AC_DEFUN([LIBCFS_KMEM_CACHE_DESTROY_INT], -[AC_MSG_CHECKING([kmem_cache_destroy(cachep) return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int i = kmem_cache_destroy(NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE_DESTROY_INT, 1, - [kmem_cache_destroy(cachep) return int]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 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]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - nlmsg_multicast(NULL, NULL, 0, 0, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NLMSG_MULTICAST_5ARGS, 1, - [nlmsg_multicast needs 5 argument]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# -# 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]) -LB_LINUX_TRY_COMPILE([ - #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_MSG_RESULT([no]) -]) -]) - -# 2.6.20 API change INIT_WORK use 2 args and not -# store data inside -AC_DEFUN([LIBCFS_3ARGS_INIT_WORK], -[AC_MSG_CHECKING([check INIT_WORK want 3 args]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct work_struct work; - - INIT_WORK(&work, NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_3ARGS_INIT_WORK, 1, - [INIT_WORK use 3 args and store data inside]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.21 api change. 'register_sysctl_table' use only one argument, -# instead of more old which need two. -AC_DEFUN([LIBCFS_2ARGS_REGISTER_SYSCTL], -[AC_MSG_CHECKING([check register_sysctl_table want 2 args]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return register_sysctl_table(NULL,0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_REGISTER_SYSCTL, 1, - [register_sysctl_table want 2 args]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# 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]) +# check cpumask_size (2.6.28) +AC_DEFUN([LIBCFS_CPUMASK_SIZE], +[AC_MSG_CHECKING([whether have cpumask_size()]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - kmem_cache_create(NULL, 0, 0, 0, NULL, NULL); + int size = cpumask_size(); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_KMEM_CACHE_CREATE_DTOR, 1, - [kmem_cache_create has dtor argument]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CPUMASK_SIZE, 1, [have cpumask_size()]) ],[ - AC_MSG_RESULT(NO) -]) -]) - -# 2.6.24 -AC_DEFUN([LIBCFS_NETLINK_CBMUTEX], -[AC_MSG_CHECKING([for mutex in netlink_kernel_create]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct mutex *lock = NULL; - - netlink_kernel_create(0, 0, NULL, lock, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NETLINK_CBMUTEX, 1, - [netlink_kernel_create want mutex for callback]) -],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(NO) ]) ]) @@ -485,84 +115,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.24 lost scatterlist->page -AC_DEFUN([LIBCFS_SCATTERLIST_SETPAGE], -[AC_MSG_CHECKING([for exist sg_set_page]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - sg_set_page(NULL,NULL,0,0); -],[ - 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 ]) -],[ - AC_MSG_RESULT(NO) -]) -]) - - -# 2.6.24 -AC_DEFUN([LIBCFS_NETLINK_NETNS], -[AC_MSG_CHECKING([for netlink support net ns]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct net *net = NULL; - struct mutex *lock = NULL; - - netlink_kernel_create(net, 0, 0, NULL, - lock, - NULL); -],[ - 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(NO) -]) -]) - -# ~2.6.24 -AC_DEFUN([LIBCFS_NL_BROADCAST_GFP], -[AC_MSG_CHECKING([for netlink_broadcast is want to have gfp parameter]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - gfp_t gfp = GFP_KERNEL; - - netlink_broadcast(NULL, NULL, 0, 0, gfp); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NL_BROADCAST_GFP, 1, - [netlink brouacast is want to have gfp paramter]) -],[ - AC_MSG_RESULT(NO) -]) -]) - # # LIBCFS_FUNC_DUMP_TRACE # @@ -571,7 +123,7 @@ LB_LINUX_TRY_COMPILE([ # AC_DEFUN([LIBCFS_FUNC_DUMP_TRACE], [LB_CHECK_SYMBOL_EXPORT([dump_trace], -[kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[ +[kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c arch/x86/kernel/dumpstack_32.c arch/x86/kernel/dumpstack_64.c],[ tmp_flags="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="-Werror" AC_MSG_CHECKING([whether we can really use dump_trace]) @@ -591,12 +143,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, @@ -605,29 +154,41 @@ 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" ]) ]) -# 2.6.26 use int instead of atomic for sem.count -AC_DEFUN([LIBCFS_SEM_COUNT], -[AC_MSG_CHECKING([atomic sem.count]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct semaphore s; - - atomic_read(&s.count); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SEM_COUNT_ATOMIC, 1, - [semaphore counter is atomic]) -],[ - AC_MSG_RESULT(NO) -]) -]) - # 2.6.27 have second argument to sock_map_fd AC_DEFUN([LIBCFS_SOCK_MAP_FD_2ARG], [AC_MSG_CHECKING([sock_map_fd have second argument]) @@ -644,68 +205,176 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# LIBCFS_CRED_WRAPPERS # -# wrappers for task's credentials are in sles11 +# LIBCFS_HAVE_IS_COMPAT_TASK +# +# Added in 2.6.17, it wasn't until 2.6.29 that all +# Linux architectures have is_compat_task() # -AC_DEFUN([LIBCFS_CRED_WRAPPERS], -[AC_MSG_CHECKING([if kernel has wrappers for task's credentials]) +AC_DEFUN([LIBCFS_HAVE_IS_COMPAT_TASK], +[AC_MSG_CHECKING([if is_compat_task() is declared]) LB_LINUX_TRY_COMPILE([ - #include + #include +],[ + int i __attribute__ ((unused)); + i = is_compat_task(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_IS_COMPAT_TASK, 1, [is_compat_task() is available]) ],[ - uid_t uid; + AC_MSG_RESULT([no]) +]) +]) - uid = current_uid(); +# +# LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +# +# 2.6.32-30.el6 adds a new 'walk_stack' field in 'struct stacktrace_ops' +# +AC_DEFUN([LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK], +[AC_MSG_CHECKING([if 'struct stacktrace_ops' has 'walk_stack' field]) +LB_LINUX_TRY_COMPILE([ + #include ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_CRED_WRAPPERS, 1, [task's cred wrappers found]) + ((struct stacktrace_ops *)0)->walk_stack(NULL, NULL, 0, NULL, NULL, NULL, NULL); ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([yes]) + AC_DEFINE(STACKTRACE_OPS_HAVE_WALK_STACK, 1, ['struct stacktrace_ops' has 'walk_stack' field]) +],[ + 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]) ]) ]) # -# LN_STRUCT_CRED_IN_TASK +# RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function # -# struct cred was introduced in 2.6.29 to streamline credentials in task struct +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) +]) +]) + # -AC_DEFUN([LIBCFS_STRUCT_CRED_IN_TASK], -[AC_MSG_CHECKING([if kernel has struct cred]) +# 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 + #include ],[ - struct task_struct *tsk = NULL; - tsk->real_cred = NULL; + struct ctl_table ct; + ct.ctl_name = sizeof(ct); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_CRED, 1, [struct cred found]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SYSCTL_CTLNAME, 1, + [ctl_table has ctl_name field]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT(no) ]) ]) # -# LIBCFS_FUNC_UNSHARE_FS_STRUCT +# LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE # -# unshare_fs_struct was introduced in 2.6.30 to prevent others to directly -# mess with copy_fs_struct +# 2.6.34 adds __add_wait_queue_exclusive # -AC_DEFUN([LIBCFS_FUNC_UNSHARE_FS_STRUCT], -[AC_MSG_CHECKING([if kernel defines unshare_fs_struct()]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" +AC_DEFUN([LIBCFS_ADD_WAIT_QUEUE_EXCLUSIVE], +[AC_MSG_CHECKING([if __add_wait_queue_exclusive exists]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include ],[ - unshare_fs_struct(); + wait_queue_head_t queue; + wait_queue_t wait; + + __add_wait_queue_exclusive(&queue, &wait); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_UNSHARE_FS_STRUCT, 1, [unshare_fs_struct found]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1, + [__add_wait_queue_exclusive exists]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# +# 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) +]) +]) + +# +# FC18 3.7.2-201 unexport sock_map_fd() change to +# use sock_alloc_file(). +# upstream commit 56b31d1c9f1e6a3ad92e7bfe252721e05d92b285 +# +AC_DEFUN([LIBCFS_SOCK_ALLOC_FILE], +[AC_MSG_CHECKING([sock_alloc_file is exported]) +LB_CHECK_SYMBOL_EXPORT([sock_alloc_file], [net/socket.c],[ + LB_LINUX_TRY_COMPILE([ + #include + ],[ + sock_alloc_file(NULL, 0, NULL); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SOCK_ALLOC_FILE_3ARGS, 1, + [sock_alloc_file takes 3 arguments]) + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SOCK_ALLOC_FILE, 1, + [sock_alloc_file is exported]) + ]) ],[ - AC_MSG_RESULT([no]) ]) -EXTRA_KCFLAGS="$tmp_flags" ]) # @@ -715,49 +384,30 @@ EXTRA_KCFLAGS="$tmp_flags" # AC_DEFUN([LIBCFS_PROG_LINUX], [ -LIBCFS_FUNC_CPU_ONLINE -LIBCFS_TYPE_GFP_T -LIBCFS_TYPE_CPUMASK_T LIBCFS_CONFIG_PANIC_DUMPLOG -LIBCFS_STRUCT_PAGE_LIST -LIBCFS_STRUCT_SIGHAND -LIBCFS_FUNC_SHOW_TASK -LIBCFS_U64_LONG_LONG -LIBCFS_SSIZE_T_LONG -LIBCFS_SIZE_T_LONG -LIBCFS_TASK_RCU +LIBCFS_U64_LONG_LONG_LINUX # 2.6.18 -LIBCFS_TASKLIST_LOCK -# 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 +LIBCFS_HAVE_IS_COMPAT_TASK # 2.6.24 LIBCFS_SYSCTL_UNNUMBERED -LIBCFS_SCATTERLIST_SETPAGE -LIBCFS_NL_BROADCAST_GFP -LIBCFS_NETWORK_NAMESPACE -LIBCFS_NETLINK_NETNS LIBCFS_FUNC_DUMP_TRACE -# 2.6.26 -LIBCFS_SEM_COUNT -# 2.6.27 -LIBCFS_CRED_WRAPPERS -# 2.6.29 -LIBCFS_STRUCT_CRED_IN_TASK +LIBCFS_HAVE_KEYTYPE_H # 2.6.30 -LIBCFS_FUNC_UNSHARE_FS_STRUCT LIBCFS_SOCK_MAP_FD_2ARG +# 2.6.32 +LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK +LC_SHRINKER_WANT_SHRINK_PTR +# 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 +# 3.7 +LIBCFS_SOCK_ALLOC_FILE ]) # @@ -798,6 +448,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])], [], @@ -843,6 +499,31 @@ AC_CHECK_TYPE([__s64], [], [#include ]) +# check userland __u64 type +AC_MSG_CHECKING([userspace __u64 is long long type]) +tmp_flags="$CFLAGS" +CFLAGS="$CFLAGS -Werror" +AC_COMPILE_IFELSE([ + #include + #include + #include + int main(void) { + unsigned long long *data1; + __u64 *data2 = NULL; + + data1 = data2; + data2 = data1; + return 0; + } +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_USER__U64_LONG_LONG, 1, + [__u64 is long long type]) +],[ + AC_MSG_RESULT([no]) +]) +CFLAGS="$tmp_flags" + # -------- Check for required packages -------------- @@ -917,16 +598,9 @@ libcfs/include/libcfs/util/Makefile libcfs/libcfs/Makefile libcfs/libcfs/autoMakefile libcfs/libcfs/linux/Makefile -libcfs/libcfs/ulinux/Makefile libcfs/libcfs/posix/Makefile libcfs/libcfs/util/Makefile -]) -case $lb_target_os in - darwin) - AC_CONFIG_FILES([ libcfs/include/libcfs/darwin/Makefile libcfs/libcfs/darwin/Makefile ]) - ;; -esac ])