From 8fa5225080c9520ed686c99d1add90e1d1cf9e19 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 20 Dec 2013 15:34:40 -0800 Subject: [PATCH] datapath: compat: Add configure check for lockdep_rtnl_is_held() RHEL6-openstack kernel has backported lockdep_rtnl_is_held(). Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- acinclude.m4 | 1 + datapath/linux/compat/include/linux/rtnetlink.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 1509b2e1c..99b4054bf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -233,6 +233,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/rcupdate.h], [rcu_read_lock_held], [], [OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], [rcu_read_lock_held])]) + OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h], [lockdep_rtnl_is_held]) # Check for the proto_data_valid member in struct sk_buff. The [^@] # is necessary because some versions of this header remove the diff --git a/datapath/linux/compat/include/linux/rtnetlink.h b/datapath/linux/compat/include/linux/rtnetlink.h index a1b689c32..cd1e1a0c0 100644 --- a/datapath/linux/compat/include/linux/rtnetlink.h +++ b/datapath/linux/compat/include/linux/rtnetlink.h @@ -3,7 +3,7 @@ #include_next -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) +#ifndef HAVE_LOCKDEP_RTNL_IS_HELD #ifdef CONFIG_PROVE_LOCKING static inline int lockdep_rtnl_is_held(void) { -- 2.43.0