Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 36d059797a14f0e373fdc3c79df7b467435925ad
Author: Alexey Dobriyan <adobriyan(a)gmail.com>
Date: Mon Aug 2 23:40:32 2021 +0300
batman-adv: use Linux's stdarg.h
Signed-off-by: Alexey Dobriyan <adobriyan(a)gmail.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com>
Acked-by: Ard Biesheuvel <ardb(a)kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
36d059797a14f0e373fdc3c79df7b467435925ad
compat-include/linux/{minmax.h => stdarg.h} | 12 ++++++------
net/batman-adv/log.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/compat-include/linux/minmax.h b/compat-include/linux/stdarg.h
similarity index 53%
copy from compat-include/linux/minmax.h
copy to compat-include/linux/stdarg.h
index 9b7269e8..335deefe 100644
--- a/compat-include/linux/minmax.h
+++ b/compat-include/linux/stdarg.h
@@ -7,14 +7,14 @@
* of the Linux kernel.
*/
-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
-#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
+#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_STDARG_H_
+#define _NET_BATMAN_ADV_COMPAT_LINUX_STDARG_H_
#include <linux/version.h>
-#if LINUX_VERSION_IS_GEQ(5, 10, 0)
-#include_next <linux/minmax.h>
+#if LINUX_VERSION_IS_GEQ(5, 15, 0)
+#include_next <linux/stdarg.h>
#else
-#include <linux/kernel.h>
+#include <stdarg.h>
#endif
-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */
+#endif
diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index f0e5d142..7a93a1e9 100644
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -7,7 +7,7 @@
#include "log.h"
#include "main.h"
-#include <stdarg.h>
+#include <linux/stdarg.h>
#include "trace.h"