From patchwork Sat Dec 15 01:19:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 1013791 X-Patchwork-Delegate: linville@tuxdriver.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W9syDaMJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43GqPS2KKPz9s3Z for ; Sat, 15 Dec 2018 12:21:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728552AbeLOBTl (ORCPT ); Fri, 14 Dec 2018 20:19:41 -0500 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 ); Fri, 14 Dec 2018 20:19:41 -0500 Received: by mail-pf1-f195.google.com with SMTP id h3so3635667pfg.1 for ; Fri, 14 Dec 2018 17:19:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nJ2c1t7E11KBS+Tv6SQk3p0cGl7Gk97nfyo4kJmKi/0=; b=W9syDaMJCsmnJ3zDjqbuBY9mjBZ0MWEWOZcBhM7q+Ry/z1s+lsLP2Fy/ApnHe1KhfD jXBO3I+sATS8gqlaAEVAaOPeDP4yDFNeROtzx3YKOOPEGNo/+ClUEVosvPTL9R+2RC7E sWgXOz8btiWCPW5m/ARaXn32hPVarEBkkd84VFC0hApbkiVbkXEoxL+3ItFTVvvdwKeC v8i2o0h1nh/xJ0tnThqcnROuxblASXOER2snqWAtjGccHWndUegLY9aNlekY56ZRiPqT YgbdE2iJ1C1MNOWODjI/0/iDjVb4jgQEE44JPNN11RZk4Fh4oC4YIahHI57urWFJuoO0 +y9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nJ2c1t7E11KBS+Tv6SQk3p0cGl7Gk97nfyo4kJmKi/0=; b=SHqkGAJ4uwBC0gbBJhfZfIzEC4w9JAtlFSmtyKR5WA/v5B9Si93+Kgx5s4SNtdv8JF z++xvUU/CMtAlL0CBPGoBUqFlva0BNePkj7QQSuB+V0kRmHh9df8GoZj1QPD+3odHH56 S1mG0QbgHbWpOmO9EL1QGmabIlsdjfnRUJjQComGZZrFNhYyzXOJMAaxADgCNs9A0Rr3 ZItNHsj8dx14SQb0rpHI0ogIFfSsvvVgslIY5tO7So9JsEY1ebOcr0AcbN0UElGbptNn o9XryAdXSKJKT5wIpDrdl09BbRmC96EeLjhrmNCjHMwbbs6jKZJzrfXg5gfJ/NdtfR2r 1l4A== X-Gm-Message-State: AA+aEWY0ljWrj4cWnedXaMRAeDTWInG6u3jaSofDKiYMIiAhjHhK8Qj3 gnxZRIz2YdjTUgR/QDaamK4= X-Google-Smtp-Source: AFSGD/Vc5LKdmBqOCs/nBhyB+hh4f+LVTt6aQUg7OUQoeq2tk8ga3XF0tIObEwQCDq8IEXF3lwQRIg== X-Received: by 2002:a63:e156:: with SMTP id h22mr4651555pgk.255.1544836780240; Fri, 14 Dec 2018 17:19:40 -0800 (PST) Received: from athina.mtv.corp.google.com ([2620:0:1000:1601:d7a4:903f:6d6b:ec10]) by smtp.gmail.com with ESMTPSA id z7sm7315819pga.6.2018.12.14.17.19.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 17:19:39 -0800 (PST) From: =?utf-8?q?Maciej_=C5=BBenczykowski?= To: =?utf-8?q?Maciej_=C5=BBenczykowski?= , Jeff Garzik , Ben Hutchings Cc: "David S . Miller" , David Decotigny , netdev@vger.kernel.org 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> X-Mailer: git-send-email 2.20.0.405.gbc1bbc6f85-goog MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski 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 --- 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 to select + * 'int-ll64.h' and avoid compile warnings when printing __u64 with %llu. + */ +#define __SANE_USERSPACE_TYPES__ +#endif #include #include #include