diff mbox

[v2] batman-adv: Add compat code for BUILD_BUG_ON_NOT_POWER_OF_2

Message ID 1453312815-20752-1-git-send-email-sven@open-mesh.com (mailing list archive)
State Accepted, archived
Commit a23e9a9ffbb38037bec60223f0377636f78763f0
Headers

Commit Message

Sven Eckelmann Jan. 20, 2016, 6 p.m. UTC 
  Fixes: 2c2fe0ba9ea5 ("batman-adv: ELP - creating neighbor structures")
Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
---
v2:
 - add missing include in average.h which is required to always defined
   BUILD_BUG_ON_NOT_POWER_OF_2 correctly

 compat-include/linux/average.h |  2 ++
 compat-include/linux/bug.h     | 13 +++++++++++++
 2 files changed, 15 insertions(+)

Comments

Marek Lindner Jan. 30, 2016, 4:17 a.m. UTC | #1 
On Wednesday, January 20, 2016 19:00:15 Sven Eckelmann wrote:
> Fixes: 2c2fe0ba9ea5 ("batman-adv: ELP - creating neighbor structures")
> Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
> ---
> v2:
>  - add missing include in average.h which is required to always defined
>    BUILD_BUG_ON_NOT_POWER_OF_2 correctly
> 
>  compat-include/linux/average.h |  2 ++
>  compat-include/linux/bug.h     | 13 +++++++++++++
>  2 files changed, 15 insertions(+)

Applied in revision a23e9a9.

Thanks,
Marek
diff mbox

Patch

diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h
index e5a2bf5..631df9b 100644
--- a/compat-include/linux/average.h
+++ b/compat-include/linux/average.h
@@ -26,6 +26,8 @@ 
 #include_next <linux/average.h>
 #endif
 
+#include <linux/bug.h>
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
 
 /* Exponentially weighted moving average (EWMA) */
diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h
index 124fd28..0c46158 100644
--- a/compat-include/linux/bug.h
+++ b/compat-include/linux/bug.h
@@ -24,6 +24,19 @@ 
 #include <linux/version.h>
 #include_next <linux/bug.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+
+#undef BUILD_BUG_ON_NOT_POWER_OF_2
+#ifdef __CHECKER__
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0)
+#else
+/* 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 /* < KERNEL_VERSION(2, 6, 33) */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
 
 #undef BUILD_BUG_ON