From patchwork Sat Nov 18 02:48:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 166424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp955648vqn; Fri, 17 Nov 2023 18:52:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPkmq+siddr4q0d1bkvhhGBnyt7ydHJX3nY+gHfUqdFA5Mzfltib/e85oNlmSeR7AMy/qv X-Received: by 2002:a81:5341:0:b0:5c0:8f5e:c900 with SMTP id h62-20020a815341000000b005c08f5ec900mr1733280ywb.19.1700275945629; Fri, 17 Nov 2023 18:52:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700275945; cv=none; d=google.com; s=arc-20160816; b=mqolsw5BpA2GeNbGqU1Ys/TZE3sOfXGyiVbOesIW48czycVg1Pp/X1ktwvvbRPUtad usTLHepXeFH5PVMn3SnzDklnmms+aqxBhI/G8d43GE4H9W3Q5qsntrYigjnZ+68pzfHo QB+C4KVI4I7ouXcAdpIlG+e9ogFC3PXaMlm8sUHLOVniQeNa/jmnWRia4u5BVYnmEzEC qDOcKShHNTns+oIV7L3t52FPS1PfHVY/WVdANRa6RTMQ78iZp1Tfwopxx6nZCo3UCFq+ suIVNoipa9ow+Krl+yVVUjdM43D6JNZF4XEVA8AB4LvTT3JVm4utISwAQiLDZ4CMDYtv 6GcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WbMspTuyF/1iH+Oas7Zuyq8VC+UiTy3J++p9EDjElSk=; fh=DIzfUWfj21RIAI8ibHhNFjdiKeApGT6CviQ22JnUOaM=; b=GccXcjH0zbf6WjBNZDfpCzadBRHFy5C8IrrVUx1lrEA/KAh54htoQ840aspIB5Kh7+ O89MToS2WNqfTXIUdzvgC/RqD++lvcItlD301Rz9GwwixndSD8YIkXoYEKiYILjnwrAi lRc5KAe4ZET7gyX1f5rvPTkBvV9YEtB/Lsk/XV9sOvsWYyvThHb7FjRoKZ0Uypngf1J+ SrpcNLLkhS2SL0yetKwJ29GhnDe9FZzKeohxLyU+dChnhVx/Ax6C9ccSGcI61A+LaZB+ ETqrzcRaHt6G8hqr3Rlkd1AbncAmtlse2Jglz9X+ELpmf/ZEbNbANCbzHfdVB4Arc1ci LcBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id m19-20020a056a00081300b006cb4b316df8si840207pfk.6.2023.11.17.18.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 18:52:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A662D804595D; Fri, 17 Nov 2023 18:52:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232854AbjKRCvv (ORCPT + 29 others); Fri, 17 Nov 2023 21:51:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbjKRCvu (ORCPT ); Fri, 17 Nov 2023 21:51:50 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 058C1D6A; Fri, 17 Nov 2023 18:51:42 -0800 (PST) Received: from kwepemm000003.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4SXJ9Y32bmz1P8FM; Sat, 18 Nov 2023 10:48:17 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm000003.china.huawei.com (7.193.23.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 18 Nov 2023 10:51:40 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 1/3] perf kwork: Fix a build error on 32-bit Date: Sat, 18 Nov 2023 02:48:56 +0000 Message-ID: <20231118024858.1567039-2-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231118024858.1567039-1-yangjihong1@huawei.com> References: <20231118024858.1567039-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.22] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm000003.china.huawei.com (7.193.23.66) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 18:52:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782868549805804983 X-GMAIL-MSGID: 1782868549805804983 lkft reported a build error for 32-bit system: builtin-kwork.c: In function 'top_print_work': builtin-kwork.c:1646:28: error: format '%ld' expects argument of type 'long int', but argument 3 has type 'u64' {aka 'long long unsigned int'} [-Werror=format=] 1646 | ret += printf(" %*ld ", PRINT_PID_WIDTH, work->id); | ~~~^ ~~~~~~~~ | | | | long int u64 {aka long long unsigned int} | %*lld cc1: all warnings being treated as errors make[3]: *** [/builds/linux/tools/build/Makefile.build:106: /home/tuxbuild/.cache/tuxmake/builds/1/build/builtin-kwork.o] Error 1 Fix it. Fixes: 55c40e505234 ("perf kwork top: Introduce new top utility") Reported-by: Linux Kernel Functional Testing Signed-off-by: Yang Jihong --- tools/perf/builtin-kwork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index f007a9b27065..0092b9b39611 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -1643,7 +1643,7 @@ static int top_print_work(struct perf_kwork *kwork __maybe_unused, struct kwork_ /* * pid */ - ret += printf(" %*ld ", PRINT_PID_WIDTH, work->id); + ret += printf(" %*" PRIu64 " ", PRINT_PID_WIDTH, work->id); /* * tgid From patchwork Sat Nov 18 02:48:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 166425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp955662vqn; Fri, 17 Nov 2023 18:52:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IHAOCXJkPF6Hz/30lQS82He6s1OJrhhyNfzqlqILDhyGJCz3fus1VXh4Je36MSEP9bz+qV0 X-Received: by 2002:a17:903:1252:b0:1cc:6e8f:c14e with SMTP id u18-20020a170903125200b001cc6e8fc14emr1993717plh.15.1700275948292; Fri, 17 Nov 2023 18:52:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700275948; cv=none; d=google.com; s=arc-20160816; b=pjx48wngq7ghfAwrbVhduwP1qlyGQOGGaNa9U8j7pl+cbS4uVR+/luZEfCLoaXyZ0t TgV+DfBBgtPfFSBSN2UXoZCSjLzGg5ZbhlDTAQcZLMYQ3E7gXgGN+la1GFqYnIIvvVvH K3fmdLX7ZhTKfNxymwhXqqF12QrrYeO74GqgrcOgyM3ReCSmeNjj90QB3MoODWKH5n5c xA7R/9VumyVd98HmdKm9XMh+tNzzhZUMSEtTENS1QuoHyIZ1bZxyVOhv7VQt0Zq+DGUb xKpKZcrb3HAS4xRYImGFD1l1JsSb3ZfxK0SBy4wA9MnTiDQBYEAz0Er+Uvqpgh70O49L OOQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=428YcJDl2841MoLUgmgdFq+T+No+CBRQs8VuOqNLiQw=; fh=DIzfUWfj21RIAI8ibHhNFjdiKeApGT6CviQ22JnUOaM=; b=GA/jTbGQZk6/Lcnb6vtdUlXXDal1Tjgh8rNrQGcZ9nGGHZ/hvKLF1wLi1ATbPIiSrQ EbH6YBGNcWSdw77InOLwwhMVz5tIxu22Qw+sAD6TOxmYLH+dCdRFatVJFhWUQcCw7C/c 8B3l8lQ7lhcZnigzmavKmCvfwuoElnvVRdWGKL6pjoJi4gh8bt+1KsGtQlwFfVNUrLPM 6ERXxlaL/PwSlcpzfKLPAG2o4aKLqoV/7+jc/epuaUgAOqi7DmkO41wmQXNbH/PSHBFB y3/TyMzctuAJ4+/f1qLoBhBx2gXglmKRhkcdGjm23K6X03EXiXtPDe6mxGCFUd80e4Qd 998g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id iw10-20020a170903044a00b001c60d1de681si3220614plb.108.2023.11.17.18.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 18:52:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6D9CE80BBC73; Fri, 17 Nov 2023 18:52:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232892AbjKRCvy (ORCPT + 29 others); Fri, 17 Nov 2023 21:51:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232840AbjKRCvv (ORCPT ); Fri, 17 Nov 2023 21:51:51 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E17A710D0; Fri, 17 Nov 2023 18:51:43 -0800 (PST) Received: from kwepemm000003.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SXJ9Y1ChyzsR5m; Sat, 18 Nov 2023 10:48:17 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm000003.china.huawei.com (7.193.23.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 18 Nov 2023 10:51:40 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 2/3] perf lock contention: Fix a build error on 32-bit Date: Sat, 18 Nov 2023 02:48:57 +0000 Message-ID: <20231118024858.1567039-3-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231118024858.1567039-1-yangjihong1@huawei.com> References: <20231118024858.1567039-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.22] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm000003.china.huawei.com (7.193.23.66) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 18:52:09 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782868552758692553 X-GMAIL-MSGID: 1782868552758692553 Fix a build error on 32-bit system: util/bpf_lock_contention.c: In function 'lock_contention_get_name': util/bpf_lock_contention.c:253:50: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'u64 {aka long long unsigned int}' [-Werror=format=] snprintf(name_buf, sizeof(name_buf), "cgroup:%lu", cgrp_id); ~~^ %llu cc1: all warnings being treated as errors Fixes: d0c502e46e97 ("perf lock contention: Prepare to handle cgroups") Signed-off-by: Yang Jihong --- tools/perf/util/bpf_lock_contention.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lock_contention.c index e105245eb905..f1716c089c99 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "bpf_skel/lock_contention.skel.h" #include "bpf_skel/lock_data.h" @@ -250,7 +251,7 @@ static const char *lock_contention_get_name(struct lock_contention *con, if (cgrp) return cgrp->name; - snprintf(name_buf, sizeof(name_buf), "cgroup:%lu", cgrp_id); + snprintf(name_buf, sizeof(name_buf), "cgroup:%" PRIu64 "", cgrp_id); return name_buf; } From patchwork Sat Nov 18 02:48:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 166423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp955632vqn; Fri, 17 Nov 2023 18:52:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IGJRwlL5nIHIqSoHKcyJ/Ve2nZgi0IXqcAvZzKBQGMVAdGGpQPK5yUgr1aitQUn23V5z7U6 X-Received: by 2002:a05:6a20:a19c:b0:187:e71d:ab41 with SMTP id r28-20020a056a20a19c00b00187e71dab41mr994218pzk.19.1700275942948; Fri, 17 Nov 2023 18:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700275942; cv=none; d=google.com; s=arc-20160816; b=S0t7k9YPODhLPWqowkpSYS8wZy10qY0kedUju2X41ZTH5qI9hbI/WKApnvl3Hz6qWr EOSBH+DSJUqNyppbkrYA1lwEFs2Rg0o6M+QYf3BxJ5jniQwkmb0tZnnPlirtxrjmODtD Gx9fxWq8Bfyy190cwdYwyc/g3Oc51mHkttPhRJPcNN8Jo+jVVO7PNfngVNQEHQ8lA7kM blWZtaChIape/FmaAG5uja4+ssrIMVHJnzyOjJRe7mdvD0rZXb0Kh1pto60AiU0+nVqg W09ESTxJ/TVzqjySUwz7m8l80pQ24Q09+M5D1L000BGbweIUtaYSIrEGizRRpwllJ2qQ wsMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=i/TRbWzglj4D/sxM+c40UW8ppDFnrM+xTpv13HZgKtU=; fh=DIzfUWfj21RIAI8ibHhNFjdiKeApGT6CviQ22JnUOaM=; b=l27GDphDQU/AZd2tD/8ioPcbQBgPo68p3noAkS17LyMhEoyCnAZiNwz/CzWh01rypI PSKogGtz0coq4lY8a5z4tOAgk4qikdWNamltATEthousGEmzg/5UT93lLdgNZVNYvRq6 YMaGVLSKuB/5a5IcOUDXCtnJZ0LwBoRK8uj+veDpwsn3/IEeD4+zpmDUo1BvVT2fXvMZ BxqmWE5wAY1OSxAK6ghUP/oTvhH5AQ9K3t8vfrPeBF9t9tuvXOy5Toz3ubcajRy/Xp0b inUajxYeAnLHftAOyhxh0IA7X5TgjL6/waM5SBlKuFM2hmytNXsRuYOCJWfG3ljB9fWx cAhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s6-20020a056a00178600b006c3482c4e4dsi3408694pfg.289.2023.11.17.18.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 18:52:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A794680A9903; Fri, 17 Nov 2023 18:51:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232869AbjKRCvx (ORCPT + 29 others); Fri, 17 Nov 2023 21:51:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232849AbjKRCvv (ORCPT ); Fri, 17 Nov 2023 21:51:51 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBD08D7A; Fri, 17 Nov 2023 18:51:43 -0800 (PST) Received: from kwepemm000003.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SXJ8b66tjzNm6f; Sat, 18 Nov 2023 10:47:27 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm000003.china.huawei.com (7.193.23.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 18 Nov 2023 10:51:41 +0800 From: Yang Jihong To: , , , , , , , , , , , , CC: Subject: [PATCH 3/3] perf bench sched-seccomp-notify: Fix __NR_seccomp undeclared build error on i386 Date: Sat, 18 Nov 2023 02:48:58 +0000 Message-ID: <20231118024858.1567039-4-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231118024858.1567039-1-yangjihong1@huawei.com> References: <20231118024858.1567039-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.22] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm000003.china.huawei.com (7.193.23.66) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 18:51:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782868547594479491 X-GMAIL-MSGID: 1782868547594479491 Fix a build error on i386 system: bench/sched-seccomp-notify.c: In function 'seccomp': bench/sched-seccomp-notify.c:46:17: error: '__NR_seccomp' undeclared (first use in this function); did you mean 'seccomp'? return syscall(__NR_seccomp, op, flags, args); ^~~~~~~~~~~~ seccomp bench/sched-seccomp-notify.c:46:17: note: each undeclared identifier is reported only once for each function it appears in bench/sched-seccomp-notify.c:47:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors Fixes: 7d5cb68af638 ("perf/benchmark: add a new benchmark for seccom_unotify") Signed-off-by: Yang Jihong --- tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h index 4798f9d18fe8..9de35df1afc3 100644 --- a/tools/arch/x86/include/uapi/asm/unistd_32.h +++ b/tools/arch/x86/include/uapi/asm/unistd_32.h @@ -26,6 +26,6 @@ #ifndef __NR_setns #define __NR_setns 346 #endif -#ifdef __NR_seccomp +#ifndef __NR_seccomp #define __NR_seccomp 354 #endif