From patchwork Mon Jul 15 13:45:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1131988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nPtG1DJbz9sBF; Mon, 15 Jul 2019 23:45:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hn1I8-0004Uq-6U; Mon, 15 Jul 2019 13:45:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hn1I5-0004UI-Uf for kernel-team@lists.ubuntu.com; Mon, 15 Jul 2019 13:45:17 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hn1I5-00029i-GF for kernel-team@lists.ubuntu.com; Mon, 15 Jul 2019 13:45:17 +0000 Received: by mail-wm1-f69.google.com with SMTP id v125so4038135wme.5 for ; Mon, 15 Jul 2019 06:45:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=D54arl9Lkb3ZsccyhjZzkUjeXGigcfhoJIvzZyHHBZs=; b=ILo2IKP9QgyBza7cBnoFuyWyGLgBzatA7zPuWyujmCpz/eDdFm6mWn/Rr1PavH1A0l 3gIPsomnb3/InFlFM5V+cYv9gCMkUYoNVtU6m4QivIVntu33TrRwur4cN8Qp9h4ti/Nw d3738x0sGMa6e95xTfD6Xe8NNlRCaEKtsUdDcVC/H/RVJSFyb4ksl0eEq4rnwsdyj47N s24WD+HRiokArxjSJytHJdn3tCHotW0ZyTS0K5etQBMU0QCHdn/0QVuzW/gkMvUr7a+k pmc/xazjp1EfIR+oAuzDx3Jcb5PY49LJ9l1ZkV2XJ0hlvWUU+iWUSbz54rRTDMCtUi9W XWug== X-Gm-Message-State: APjAAAWlXIv3mj1FnTjdaWOlbn+BUcNoeopnD1Jx6ThJuNKVLEsq2jJn BLemuLYociyEU55YWNl4R++v8ySJs8milK4P3bGBVI8fA8CMqLxyWboxOSp3gxgmBIEFHSTKhVz CVBlTzgAQa416JT8xQAEscvq7aBjkOsRhqr+I7I1cGw== X-Received: by 2002:a5d:4a02:: with SMTP id m2mr28997628wrq.78.1563198317009; Mon, 15 Jul 2019 06:45:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxjC5e6KPktPqpY6mNkq8SJOnV28LtzZCxsmJam+y4w09QLjQ3m4Z93HfiWBEP5VwOl5u5GQ== X-Received: by 2002:a5d:4a02:: with SMTP id m2mr28997611wrq.78.1563198316778; Mon, 15 Jul 2019 06:45:16 -0700 (PDT) Received: from localhost (ip5f5aeb8d.dynamic.kabel-deutschland.de. [95.90.235.141]) by smtp.gmail.com with ESMTPSA id j6sm22583002wrx.46.2019.07.15.06.45.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jul 2019 06:45:16 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 1/1] Revert "UBUNTU: SAUCE: perf/bench: Drop definition of BIT in numa.c" Date: Mon, 15 Jul 2019 15:45:14 +0200 Message-Id: <20190715134514.23782-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190715134514.23782-1-kleber.souza@canonical.com> References: <20190715134514.23782-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1836585 This reverts commit 54cba3ec59aff68031074b50af358ad2fc9b183a. Commit "UBUNTU: SAUCE: perf/bench: Drop definition of BIT in numa.c" is causing build failures on tools/perf/bench after stable upstream commit "perf tools: No need to include bitops.h in util.h" removed the inclusion of the header file where the BIT() macro is defined. This causes perf build failures when libnuma is installed. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- tools/perf/bench/numa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 17372bb7af84..df41deed0320 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -724,6 +724,8 @@ static int parse_nodes_opt(const struct option *opt __maybe_unused, return 0; } +#define BIT(x) (1ul << x) + static inline uint32_t lfsr_32(uint32_t lfsr) { const uint32_t taps = BIT(1) | BIT(5) | BIT(6) | BIT(31);