[ethtool PATCH v4 01/11] internal.h: change to new sane kernel headers on 64-bit archs
From: Maciej Żenczykowski On ppc64, 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); ^ Signed-off-by: Maciej Żenczykowski Signed-off-by: David Decotigny --- internal.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/internal.h b/internal.h index b5ef646..e38d305 100644 --- a/internal.h +++ b/internal.h @@ -3,6 +3,12 @@ #ifndef ETHTOOL_INTERNAL_H__ #define ETHTOOL_INTERNAL_H__ +/* Some platforms (eg. ppc64) need __SANE_USERSPACE_TYPES__ before + * to select 'int-ll64.h' and avoid compile warnings + * when printing __u64 with %llu. + */ +#define __SANE_USERSPACE_TYPES__ + #ifdef HAVE_CONFIG_H #include "ethtool-config.h" #endif -- 2.7.0.rc3.207.g0ac5344
[ethtool PATCH v4 01/11] internal.h: change to new sane kernel headers on 64-bit archs
From: Maciej Żenczykowski On ppc64, 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); ^ Signed-off-by: Maciej Żenczykowski Signed-off-by: David Decotigny --- internal.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/internal.h b/internal.h index b5ef646..e38d305 100644 --- a/internal.h +++ b/internal.h @@ -3,6 +3,12 @@ #ifndef ETHTOOL_INTERNAL_H__ #define ETHTOOL_INTERNAL_H__ +/* Some platforms (eg. ppc64) need __SANE_USERSPACE_TYPES__ before + * to select 'int-ll64.h' and avoid compile warnings + * when printing __u64 with %llu. + */ +#define __SANE_USERSPACE_TYPES__ + #ifdef HAVE_CONFIG_H #include "ethtool-config.h" #endif -- 2.7.0.rc3.207.g0ac5344
