From: Maciej Żenczykowski <m...@google.com>
This fixes:
In file included from ethtool-copy.h:22:0,
from internal.h:32,
from ethtool.c:29:
.../include/linux/types.h:32:25: error: conflicting types for '__be64'
typedef __u64 __bitwise __be64;
^
In file included from ethtool.c:29:0:
internal.h:23:28: note: previous declaration of '__be64' was here
typedef unsigned long long __be64;
^
ethtool.c: In function 'do_gstats':
ethtool.c:3166:4: error: format '%llu' expects argument of type 'long long
unsigned int', but argument 5 has type '__u64' [-Werror=format=]
stats->data[i]);
^
ethtool.c: In function 'print_indir_table':
ethtool.c:3293:9: error: format '%llu' expects argument of type 'long long
unsigned int', but argument 3 has type '__u64' [-Werror=format=]
ctx->devname, ring_count->data);
^
$ gcc -dM -E - <<< "" | egrep -i 'power|ppc|arm|aarch|x86|86|amd'
.#define __x86_64 1
.#define __amd64 1
.#define __x86_64__ 1
.#define __amd64__ 1
.#define _ARCH_PPCGR 1
.#define __PPC64__ 1
.#define _ARCH_PPC 1
.#define __powerpc64__ 1
.#define __PPC__ 1
.#define __powerpc__ 1
.#define _ARCH_PPC64 1
.#define __AARCH64_CMODEL_SMALL__ 1
.#define __aarch64__ 1
.#define __AARCH64EL__ 1
.#define __ARM_NEON 1
Signed-off-by: Maciej Żenczykowski <m...@google.com>
---
ethtool-copy.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ethtool-copy.h b/ethtool-copy.h
index 6bfbb85f9402..7772a4970987 100644
--- a/ethtool-copy.h
+++ b/ethtool-copy.h
@@ -14,6 +14,12 @@
#ifndef _LINUX_ETHTOOL_H
#define _LINUX_ETHTOOL_H
+#ifdef __powerpc64__
+/* Powerpc needs __SANE_USERSPACE_TYPES__ before <linux/types.h> to select
+ * 'int-ll64.h' and avoid compile warnings when printing __u64 with %llu.
+ */
+#define __SANE_USERSPACE_TYPES__
+#endif
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/if_ether.h>
--
2.20.0.405.gbc1bbc6f85-goog
