mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-17 14:28:02 +00:00
Code Issues Releases Wiki Activity

datapath: Check for backported rcu_read_lock_held.

Browse Source 
New versions of Xen backport this function.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Jesse Gross
2011-02-07 17:22:58 -08:00
parent 303708cc84
commit cf6cb3a2ab
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@@ -168,6 +168,10 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro]) OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro])
OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats]) OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats])
OVS_GREP_IFELSE([$KSRC26/include/linux/rcupdate.h], [rcu_read_lock_held], [],
[OVS_GREP_IFELSE([$KSRC26/include/linux/rtnetlink.h],
[rcu_read_lock_held])])
# Check for the proto_data_valid member in struct sk_buff. The [^@] # Check for the proto_data_valid member in struct sk_buff. The [^@]
# is necessary because some versions of this header remove the # is necessary because some versions of this header remove the
# member but retain the kerneldoc comment that describes it (which # member but retain the kerneldoc comment that describes it (which

2
datapath/linux-2.6/compat-2.6/include/linux/rcupdate.h
View File

@@ -11,7 +11,7 @@
#define rcu_dereference_protected(p, c) (p) #define rcu_dereference_protected(p, c) (p)
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) #ifndef HAVE_RCU_READ_LOCK_HELD
static inline int rcu_read_lock_held(void) static inline int rcu_read_lock_held(void)
{ {
return 1; return 1;