From: David Erickson Date: Mon, 23 Jun 2008 23:22:49 +0000 (-0700) Subject: Fixed a linking collision where jiffies have been backported to kernel X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bdd107e0;p=openvswitch Fixed a linking collision where jiffies have been backported to kernel 2.6.18-53 which is included in CENTOS 5.1. --- diff --git a/datapath/linux-2.6/compat-2.6/include/linux/timer.h b/datapath/linux-2.6/compat-2.6/include/linux/timer.h index d37fcadd..6b660201 100644 --- a/datapath/linux-2.6/compat-2.6/include/linux/timer.h +++ b/datapath/linux-2.6/compat-2.6/include/linux/timer.h @@ -4,7 +4,9 @@ #include_next #include -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) +#if ((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) && \ + (!defined(RHEL_RELEASE_CODE) || \ + (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,1)))) extern unsigned long volatile jiffies;