[ovs-dev] compat: Fix compilation error on CentOS 7.6
diff mbox series

Message ID 1561486147-43240-1-git-send-email-yihung.wei@gmail.com
State Accepted
Headers show
Series
  • [ovs-dev] compat: Fix compilation error on CentOS 7.6
Related show

Commit Message

Yi-Hung Wei June 25, 2019, 6:09 p.m. UTC
This fix the compilation issue on CentOS 7.6 kernel
(3.10.0-957.21.3.el7.x86_64).

Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2019-June/360013.html
Reported-by: Fred Neubauer <fred.neubauer@gmail.com>
Fixes: 6660a9597a49 ("datapath: compat: Introduce static key support")
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
---
Please backport it to branch 2.11 and 2.10.
Travis test: https://travis-ci.org/YiHungWei/ovs/builds/550012659
---
 datapath/linux/compat/include/linux/static_key.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Gregory Rose June 25, 2019, 10:19 p.m. UTC | #1
On 6/25/2019 11:09 AM, Yi-Hung Wei wrote:
> This fix the compilation issue on CentOS 7.6 kernel
> (3.10.0-957.21.3.el7.x86_64).
>
> Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2019-June/360013.html
> Reported-by: Fred Neubauer <fred.neubauer@gmail.com>
> Fixes: 6660a9597a49 ("datapath: compat: Introduce static key support")
> Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
> ---
> Please backport it to branch 2.11 and 2.10.
> Travis test: https://travis-ci.org/YiHungWei/ovs/builds/550012659
> ---
>   datapath/linux/compat/include/linux/static_key.h | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/datapath/linux/compat/include/linux/static_key.h b/datapath/linux/compat/include/linux/static_key.h
> index 01c6a93f07fe..7e43a49e84f1 100644
> --- a/datapath/linux/compat/include/linux/static_key.h
> +++ b/datapath/linux/compat/include/linux/static_key.h
> @@ -1,6 +1,7 @@
>   #ifndef _STATIC_KEY_WRAPPER_H
>   #define _STATIC_KEY_WRAPPER_H
>   
> +#include <linux/atomic.h>
>   #include_next <linux/static_key.h>
>   #ifndef HAVE_UPSTREAM_STATIC_KEY
>   /*
Works as advertised.

Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Ben Pfaff June 26, 2019, 3:17 p.m. UTC | #2
On Tue, Jun 25, 2019 at 11:09:07AM -0700, Yi-Hung Wei wrote:
> This fix the compilation issue on CentOS 7.6 kernel
> (3.10.0-957.21.3.el7.x86_64).
> 
> Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2019-June/360013.html
> Reported-by: Fred Neubauer <fred.neubauer@gmail.com>
> Fixes: 6660a9597a49 ("datapath: compat: Introduce static key support")
> Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
> ---
> Please backport it to branch 2.11 and 2.10.
> Travis test: https://travis-ci.org/YiHungWei/ovs/builds/550012659

Applied to master and backported to 2.11 and 2.10.

Thank you!

Patch
diff mbox series

diff --git a/datapath/linux/compat/include/linux/static_key.h b/datapath/linux/compat/include/linux/static_key.h
index 01c6a93f07fe..7e43a49e84f1 100644
--- a/datapath/linux/compat/include/linux/static_key.h
+++ b/datapath/linux/compat/include/linux/static_key.h
@@ -1,6 +1,7 @@ 
 #ifndef _STATIC_KEY_WRAPPER_H
 #define _STATIC_KEY_WRAPPER_H
 
+#include <linux/atomic.h>
 #include_next <linux/static_key.h>
 #ifndef HAVE_UPSTREAM_STATIC_KEY
 /*