Received: by 10.213.65.68 with SMTP id h4csp378924imn; Tue, 20 Mar 2018 05:49:50 -0700 (PDT) X-Google-Smtp-Source: AG47ELsppqk3nvz73QdaB2vrm4rQeJWnSOrj7Fn7leUHKaXAg06V0PpVghnVT2TgBUGDqhlqUfo4 X-Received: by 10.101.70.132 with SMTP id h4mr11922275pgr.155.1521550190741; Tue, 20 Mar 2018 05:49:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521550190; cv=none; d=google.com; s=arc-20160816; b=CoiqGdFA1OyQtNtfJCA6iVbs0HooCgVESZaJTA+rK2Hml9mWcyR17tqxtftD/JSNfg gakAQOyfLXPdTD06L+oHeGeZApvbtqmk5+deBa57kwgtLJXDwnHdYhNR29OciwQ2jgFt NqaeT6pRnyvH3t0P61cuxyUnYUF6EOHEPVvMTDysWoLjzWoNdJhtP71a63/Fxgkp9onD UsetKxz74yj9ZOulktloBo+npW7fSmmEITqsDfai5bq3rCofkErMTrW3tWBT46nEVLIH vi3FxVYBbvNxl5xlXmxoOHTqrtBrXwanTmbuyaDF7r0NZhPR00fJ3qjQYA9P18t/m2NH aaZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :mime-version:dkim-signature:arc-authentication-results; bh=YuGed3bTMvL2n4KHmFlPFjjNMd7f3WerhMzZVu8kOEM=; b=DyfirGfcbjgsg4tYwNvs/RpZP08OgSo0LccErjUQU3p6if5GPmx4VnQIP9bIPO3qUR 2ZXmcyLXL/Xbap417Q8Ygp4LRLzY7G5pJbmz58o2xw8IbsNLbu9hzoFZ1DooIRH81QHW fDnwEk5aPdWWewPRLH1EpzeMpgnRi/rcP6dTjeKHy5Up+F0nvl3jDveAp/04YtfBrjKt fbRMBLLzW8S6HyM+HQRqMPFF8WmLv5BDf0E9kLQRp5UOwEd/kE6i5toS4Tx6ZyTB/sm8 vUVgeMXo6kWKUysRC7YyGU+3sWnzRzVpURFUemkZhev3qNBtFx+qjOuWjLJWswL2vK7k BcuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dEBf0tmo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o6si1130479pgf.658.2018.03.20.05.49.35; Tue, 20 Mar 2018 05:49:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dEBf0tmo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753229AbeCTMon (ORCPT + 99 others); Tue, 20 Mar 2018 08:44:43 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:40712 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbeCTMol (ORCPT ); Tue, 20 Mar 2018 08:44:41 -0400 Received: by mail-wm0-f65.google.com with SMTP id t6so3220586wmt.5 for ; Tue, 20 Mar 2018 05:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=YuGed3bTMvL2n4KHmFlPFjjNMd7f3WerhMzZVu8kOEM=; b=dEBf0tmowWopqamCmXavGjqL2IjK4eQYAKWwnydeaKpRuTf1NNIm1zzrPCzI5TiSjZ VZSHpQRnhvkOFd3pdf+RaFQ3j78IBn8cLyaytQlV7irVlbaWj9FOhwYz/T3jhowlOqWI j+Uq8DCCkOg9xqsH8qnYOfdhaSq+Hv7dTYoP8zreijlAhECWVAbv8S8FL46uvj2GZN14 OdI6Yq+qEL4J0Qjn+Ot4XHF0eOKA5/1I4Rm+WX7AjZJTYML4G5YVPpFgIUauqLRqocZK WmWUuJiJtlUAqr19c47Rb1R1cpHKZX7DoPIlqrZsbjiHdyuvNYlTn8VP8n7SV7Yvh84s yDDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=YuGed3bTMvL2n4KHmFlPFjjNMd7f3WerhMzZVu8kOEM=; b=JnKQmdJadhkNz/SiOhJNt0BA9tDMeG3Oi/DKBsEy+jl370zLerlfiPOmjw8IM7efaJ hOcxA/cFIyeoE8pQYypP2SrNh76v3z6K32642yqQnNHlRyNLtViUOLd4xyvo+ni6q6mC mrPintbPdNPumtBgivQVgNiAioJotZhzvjb4I5ZMoc19NUmiic2kc94TCBk023s4Lx2b qu/PqW0b8pLhtV9dJJOpJ75VrzicfNztc13HGxx7kBOp/tzYy+S38sJygkL3ygQFP2CO /6hP5WRcFrj4HO5M5EQ/iJZ9cl3iZ1pdba2RCK0BE8BdAYmZ5QfhFUOcJCO30QXXfWFO JPxw== X-Gm-Message-State: AElRT7H6J+hrgLv9TZxpZ1Xw/dmutJcOPtR8IZf3YOLdr8VBre/VzoXL p3S9yb8sQs4nCwpJO1hzhkrDHQfYD5nWzV7PWT6vPA== X-Received: by 10.28.172.135 with SMTP id v129mr271740wme.144.1521549880579; Tue, 20 Mar 2018 05:44:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.179.131 with HTTP; Tue, 20 Mar 2018 05:44:39 -0700 (PDT) From: Wladislav Wiebe Date: Tue, 20 Mar 2018 13:44:39 +0100 Message-ID: Subject: [PATCH] tools: fix another redefinition of BITS_PER_LONG To: kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, tglx@linutronix.de, pombredanne@nexb.com Cc: linux-kernel@vger.kernel.org, Wladislav Wiebe Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If BITS_PER_LONG gets already defined in linux/tools/include/linux/bitops.h it shouldn't be redefined in tools/include/asm-generic/bitsperlong.h. This patch prevents such compilation error: [..]/linux/tools/include/asm-generic/bitsperlong.h:8:0: error: "BITS_PER_LONG" redefined [-Werror] #define BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) In file included from [..]/linux/tools/include/linux/hashtable.h:13:0, from elf.h:24, from check.h:22, from builtin-check.c:30: [..]/linux/tools/include/linux/bitops.h:13:0: note: this is the location of the previous definition Signed-off-by: Wladislav Wiebe --- tools/include/asm-generic/bitsperlong.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/include/asm-generic/bitsperlong.h b/tools/include/asm-generic/bitsperlong.h index 8f2283052333..c69a5fa3a096 100644 --- a/tools/include/asm-generic/bitsperlong.h +++ b/tools/include/asm-generic/bitsperlong.h @@ -4,11 +4,13 @@ #include +#ifndef BITS_PER_LONG #ifdef __SIZEOF_LONG__ #define BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) #else #define BITS_PER_LONG __WORDSIZE #endif +#endif #if BITS_PER_LONG != __BITS_PER_LONG #error Inconsistent word size. Check asm/bitsperlong.h -- 2.16.1