Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit d5e1bbd456cdc4762d6ce5a6c45e890ef3a7b0d5 Author: Sven Eckelmann sven@narfation.org Date: Sun Jun 21 15:23:04 2015 +0200

batman-adv: Add compat code for lockdep_assert_held

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

d5e1bbd456cdc4762d6ce5a6c45e890ef3a7b0d5 compat-include/linux/{slab.h => lockdep.h} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/compat-include/linux/slab.h b/compat-include/linux/lockdep.h similarity index 71% copy from compat-include/linux/slab.h copy to compat-include/linux/lockdep.h index 276d678..e646114 100644 --- a/compat-include/linux/slab.h +++ b/compat-include/linux/lockdep.h @@ -18,16 +18,16 @@ * of the Linux kernel. */

-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_

#include <linux/version.h> -#include_next <linux/slab.h> +#include_next <linux/lockdep.h>

-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)

-#define kmalloc_array(n, size, flags) kmalloc(n * size, flags) +#define lockdep_assert_held(l) do { (void)(l); } while (0)

-#endif /* < KERNEL_VERSION(3, 4, 0) */ +#endif /* < KERNEL_VERSION(2, 6, 32) */

-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ */