In Linux 3.4 the definition for BUILD_BUG_ON_NOT_POWER_OF_2 was moved from kernel.h to bug.h. On various kernels these header files include each other in various orders (often through a long chain of other header files), which can create circular dependency issues. Since we not longer need this definition, this simply removes the backport.
Reported-by: Palo Andi <[email protected]> Signed-off-by: Jesse Gross <[email protected]> --- datapath/linux/Modules.mk | 1 - datapath/linux/compat/include/linux/bug.h | 12 ------------ datapath/linux/compat/include/linux/kernel.h | 4 ---- 3 files changed, 17 deletions(-) delete mode 100644 datapath/linux/compat/include/linux/bug.h diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index 4fabc45..60351ce 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -14,7 +14,6 @@ openvswitch_sources += \ linux/compat/workqueue.c openvswitch_headers += \ linux/compat/include/asm/percpu.h \ - linux/compat/include/linux/bug.h \ linux/compat/include/linux/compiler.h \ linux/compat/include/linux/compiler-gcc.h \ linux/compat/include/linux/cpumask.h \ diff --git a/datapath/linux/compat/include/linux/bug.h b/datapath/linux/compat/include/linux/bug.h deleted file mode 100644 index d24e68e..0000000 --- a/datapath/linux/compat/include/linux/bug.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __BUG_H_WRAPPER -#define __BUG_H_WRAPPER 1 - -#include_next <linux/bug.h> - -#ifndef BUILD_BUG_ON_NOT_POWER_OF_2 -/* Force a compilation error if a constant expression is not a power of 2 */ -#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \ - BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0)) -#endif - -#endif diff --git a/datapath/linux/compat/include/linux/kernel.h b/datapath/linux/compat/include/linux/kernel.h index 069839b..2fa5cc8 100644 --- a/datapath/linux/compat/include/linux/kernel.h +++ b/datapath/linux/compat/include/linux/kernel.h @@ -7,10 +7,6 @@ #endif #include <linux/version.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) -/* BUILD_BUG_ON_NOT_POWER_OF_2 definition */ -#include <linux/bug.h> -#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) #undef pr_emerg -- 1.7.10.4 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
