include/linux/rhashtable.h now uses struct lockdep_map unconditionally which is fine for upstream as lockdep.h defines an empty lockdep_map structure if CONFIG_LOCKDEP is not set. However, that is only true since kernel 4.15 so adding such definition in our lockdep.h to cover older kernels. Signed-off-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx> --- backport/backport-include/linux/lockdep.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backport/backport-include/linux/lockdep.h b/backport/backport-include/linux/lockdep.h index 5a5d0d0..12b91b4 100644 --- a/backport/backport-include/linux/lockdep.h +++ b/backport/backport-include/linux/lockdep.h @@ -14,4 +14,10 @@ #endif /* CONFIG_LOCKDEP */ #endif /* LINUX_VERSION_IS_LESS(3,9,0) */ +#if LINUX_VERSION_IS_LESS(4,15,0) +#ifndef CONFIG_LOCKDEP +struct lockdep_map { }; +#endif /* CONFIG_LOCKDEP */ +#endif /* LINUX_VERSION_IS_LESS(4,15,0) */ + #endif /* __BACKPORT_LINUX_LOCKDEP_H */ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in