From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <zenczykowski@gmail.com>
Subject: [PATCH] ethtool: change to new sane powerpc64 kernel headers
Date: Fri, 14 Dec 2018 17:19:36 -0800
Message-ID: <20181215011936.246249-1-zenczykowski@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: "David S . Miller" <davem@davemloft.net>,
        David Decotigny <decot@google.com>, netdev@vger.kernel.org
To: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>,
        Jeff Garzik <jgarzik@pobox.com>,
        Ben Hutchings <ben@decadent.org.uk>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-pf1-f195.google.com ([209.85.210.195]:34249 "EHLO
        mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726448AbeLOBTl (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 14 Dec 2018 20:19:41 -0500
Received: by mail-pf1-f195.google.com with SMTP id h3so3635667pfg.1
        for <netdev@vger.kernel.org>; Fri, 14 Dec 2018 17:19:40 -0800 (PST)
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

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