netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Maciej Żenczykowski" <zenczykowski@gmail.com>
To: "Maciej Żenczykowski" <maze@google.com>,
	"Jeff Garzik" <jgarzik@pobox.com>,
	"Ben Hutchings" <ben@decadent.org.uk>
Cc: "David S . Miller" <davem@davemloft.net>,
	David Decotigny <decot@google.com>,
	netdev@vger.kernel.org
Subject: [PATCH] ethtool: change to new sane powerpc64 kernel headers
Date: Fri, 14 Dec 2018 17:19:36 -0800	[thread overview]
Message-ID: <20181215011936.246249-1-zenczykowski@gmail.com> (raw)

From: Maciej Żenczykowski <maze@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 <maze@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

             reply	other threads:[~2018-12-15  1:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-15  1:19 Maciej Żenczykowski [this message]
2018-12-15 12:30 ` [PATCH] ethtool: change to new sane powerpc64 kernel headers Ben Hutchings
2019-01-18 18:40 ` John W. Linville

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181215011936.246249-1-zenczykowski@gmail.com \
    --to=zenczykowski@gmail.com \
    --cc=ben@decadent.org.uk \
    --cc=davem@davemloft.net \
    --cc=decot@google.com \
    --cc=jgarzik@pobox.com \
    --cc=maze@google.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).