ethtool: change to new sane powerpc64 kernel headers
Subsystems (2)
PATCH 1/1 ethtool: change to new sane powerpc64 kernel headers
From: Maciej Żenczykowski <[email protected]>
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
--- ethtool-copy.h | 6 ++++++ 1 file changed, 6 insertions(+)
ethtool-copy.h +6 -0
@@ -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>
Signature · 1 line
2.20.0.405.gbc1bbc6f85-goog
Quoted 64 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
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_641
.#define__amd641
.#define__x86_64__1
.#define__amd64__1.#define
_ARCH_PPCGR1
.#define__PPC64__1
.#define_ARCH_PPC1
.#define__powerpc64__1
.#define__PPC__1
.#define__powerpc__1
.#define_ARCH_PPC641.#define
__AARCH64_CMODEL_SMALL__1
.#define__aarch64__1
.#define__AARCH64EL__1
.#define__ARM_NEON1Signed-off-by Maciej Żenczykowski <[email protected]>--- ethtool-copy.h | 6 ++++++ 1 file changed, 6 insertions(+)ethtool-copy.h +6
-0@@ -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>
Signature · 2 lines
Ben Hutchings If you seem to know what you are doing, you'll be given more to do.
Quoted 37 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
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_641
.#define__amd641
.#define__x86_64__1
.#define__amd64__1.#define
_ARCH_PPCGR1
.#define__PPC64__1
.#define_ARCH_PPC1
.#define__powerpc64__1
.#define__PPC__1
.#define__powerpc__1
.#define_ARCH_PPC641
Quoted 6 lines
.#define
__AARCH64_CMODEL_SMALL__1
.#define__aarch64__1
.#define__AARCH64EL__1
.#define__ARM_NEON1Signed-off-by Maciej Żenczykowski <[email protected]>
Queued for next release.
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.