From patchwork Sat Aug 5 07:37:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 131468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp360171vqr; Sat, 5 Aug 2023 02:36:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnaQRtcP/YZyrCXCUg8wCemeZ7qA4XiBr11uI1ubANtadMdBhBvzT147PhBucNijhlnrtz X-Received: by 2002:a17:906:32c4:b0:99b:c8bf:3f06 with SMTP id k4-20020a17090632c400b0099bc8bf3f06mr2179272ejk.24.1691228179032; Sat, 05 Aug 2023 02:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691228179; cv=none; d=google.com; s=arc-20160816; b=w51mwwITp/GR4joQ/h2XFVH8zVsdNvrYpPxdz+i3BDsjlhqNo/qypcYK+f7Q4fLayx ydCJN9NwjOiC+AlGDZc0AO5mgGB+FKx+0WUUXyfO/w1fFM25RWzsyHr6yLWB75asHDGw UZSo2cfgAgodXy5gDhQkCk1LjfKy9+0eUW2Mzm/OUwE9YMKzFiI7eY7SAnDcKehOfcoL dGl9AkW6y615QOA0tzRprKU8wZ1e/yEjtniHqqk8HovkOoci9GFArEpy5UvtJofjRhhd ADg+tdPL+wYyfHVtcJUeTv2cIc9gHw+wdK+g/mZsOPrks1HQBEnC62rQ6feiRSFk/rxG iUJQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Hd9vPgkBmc6pYje7cUdzVlk0BZYswjjHWxQmKe8kCuk=; fh=75wuEtBkDdM9hKI3tsPHADTGAXOyE0eLpihrSICuDV8=; b=bUAjl64auN6DUwIx/P7cs3UAT22od1RP/xILa0v0UOCot7k85nk0MHFf11bQUnIvE1 msYF96B2ieqh/XRAFZOHHJA9JA6r0FDjXd/zYMM4hGcMvjjtYcaLM413FFLI4fMsBKou Lxd0XvNb7O6RWvyhF8nV/YxQ3Q6d7yFQPtlJdmmxViEGOIwJ9zfbBGvsFbfL6gt6yNsV SIv68nBihT67dA4MhJ08kuIq/giNpfxAYpyJLUuu+YxQ1MSc3q9EABEvhubJFJZDRhBT t32bl/7naeu+GFygW5NJ6ttpXxnfBUn6JbsALMelG/z8SQjUbmihbm1tNwZWYawvbaxg P58Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mreXjLAs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id os2-20020a170906af6200b009895e9b8819si1627007ejb.1051.2023.08.05.02.35.54; Sat, 05 Aug 2023 02:36:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mreXjLAs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229822AbjHEHiV (ORCPT + 99 others); Sat, 5 Aug 2023 03:38:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbjHEHiT (ORCPT ); Sat, 5 Aug 2023 03:38:19 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A8AA4ECB; Sat, 5 Aug 2023 00:38:18 -0700 (PDT) Received: from localhost.localdomain (unknown [59.103.216.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 8F7D16607185; Sat, 5 Aug 2023 08:38:14 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691221096; bh=T1gmHJSmBZ1fsUMOMsX2TjrN4WmMi/RdeZt+BUdWBE4=; h=From:To:Cc:Subject:Date:From; b=mreXjLAsnKYryATtZ8P1ASgsHotjTcLRyKzRdkGE00wN3/dkfyl+3tvQGUs56Mfvc VLC6Qpv0dvdXI2fXXpqvC0fZSveMq6zyKreNgexdvPo53zfVr2Vc0zGlVPcFNLsGee JM38/VUtvZttrbKdTof33pwMhmhmaOVhHyqfKoxfxCS683g48OCjbnjdHK8+r7u475 jIAFzk1iSHeYXHrCKcFk9umHtQtWwileMpQyl84mtm6OUwQq46XeoG76/9kgjeSduy nLaTSWuOj5DqVer2G6GzvinziQsVOOfiXKFtKKV8OaIYAKa/UhlaNI0ynKggPKitlN 0ZONSjcbX02dg== From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6] selftests: capabilities: remove duplicate unneeded defines Date: Sat, 5 Aug 2023 12:37:59 +0500 Message-Id: <20230805073809.1753462-1-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773381279338899635 X-GMAIL-MSGID: 1773381279338899635 These duplicate defines should automatically be picked up from kernel headers. Use KHDR_INCLUDES to add kernel header files. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/capabilities/Makefile | 2 +- tools/testing/selftests/capabilities/test_execve.c | 8 -------- tools/testing/selftests/capabilities/validate_cap.c | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/tools/testing/selftests/capabilities/Makefile b/tools/testing/selftests/capabilities/Makefile index 6e9d98d457d5b..411ac098308f1 100644 --- a/tools/testing/selftests/capabilities/Makefile +++ b/tools/testing/selftests/capabilities/Makefile @@ -2,7 +2,7 @@ TEST_GEN_FILES := validate_cap TEST_GEN_PROGS := test_execve -CFLAGS += -O2 -g -std=gnu99 -Wall +CFLAGS += -O2 -g -std=gnu99 -Wall $(KHDR_INCLUDES) LDLIBS += -lcap-ng -lrt -ldl include ../lib.mk diff --git a/tools/testing/selftests/capabilities/test_execve.c b/tools/testing/selftests/capabilities/test_execve.c index df0ef02b40367..e3a352b020a79 100644 --- a/tools/testing/selftests/capabilities/test_execve.c +++ b/tools/testing/selftests/capabilities/test_execve.c @@ -20,14 +20,6 @@ #include "../kselftest.h" -#ifndef PR_CAP_AMBIENT -#define PR_CAP_AMBIENT 47 -# define PR_CAP_AMBIENT_IS_SET 1 -# define PR_CAP_AMBIENT_RAISE 2 -# define PR_CAP_AMBIENT_LOWER 3 -# define PR_CAP_AMBIENT_CLEAR_ALL 4 -#endif - static int nerrs; static pid_t mpid; /* main() pid is used to avoid duplicate test counts */ diff --git a/tools/testing/selftests/capabilities/validate_cap.c b/tools/testing/selftests/capabilities/validate_cap.c index cdfc94268fe6e..60b4e7b716a75 100644 --- a/tools/testing/selftests/capabilities/validate_cap.c +++ b/tools/testing/selftests/capabilities/validate_cap.c @@ -9,14 +9,6 @@ #include "../kselftest.h" -#ifndef PR_CAP_AMBIENT -#define PR_CAP_AMBIENT 47 -# define PR_CAP_AMBIENT_IS_SET 1 -# define PR_CAP_AMBIENT_RAISE 2 -# define PR_CAP_AMBIENT_LOWER 3 -# define PR_CAP_AMBIENT_CLEAR_ALL 4 -#endif - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) # define HAVE_GETAUXVAL #endif From patchwork Sat Aug 5 07:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 131466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp354966vqr; Sat, 5 Aug 2023 02:20:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3vZiP6tsSSolPuzBVKx4mYf3o+xm41pKRovdkiXM5vGwqPnpusWeupOcU6nJYejIEA+JZ X-Received: by 2002:a05:6808:1408:b0:3a7:5d6e:dcf8 with SMTP id w8-20020a056808140800b003a75d6edcf8mr6717867oiv.39.1691227216781; Sat, 05 Aug 2023 02:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691227216; cv=none; d=google.com; s=arc-20160816; b=rMhpdfa2xEWC02qX4/RvBh9vQ3brw1hgA23v0eIme+6sG6nAo3pv78n7EjQMx/7GiO NiwdvLXuYuaB0ZiOW1AAlFGEm0EDRPB12+Oj/CO0FYKDBdxyzXXobDAfddoiO6uwf1Ts wB7UOKAJOOmAqPW0/LEVY0J6ghbOJmgAh/R//EsKC86TQqTHKmfiT2nl9gwvEvo6dc+u 35gMyxK8rLpVTlCXwvjKRTmEcDAIk1wzx05zyOZW6xmSb9mHWSjfSse4FSnEcgiXtUe9 BewJkYvwEURyQXsFdqhWriikHuvF5rnXfO6oax9l5OauAFik+i+XBZgEiAbFVwzRVuy2 hLsg== 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 :dkim-signature; bh=S5AjKy5qIrHlbL/+UyCAifBaMGr51UpcmV+C78x4ZUY=; fh=izMzeQwcxs3fwHhUwsXigBC2gYv79e9bOKvyRHGWFxE=; b=gHlTwtda8NBeE2Ag6vxaHm4Ozpdt55tUErUWG4/u7i/WFcdqrbeDLQhQlqQ5pxGCu3 Wm8FglQ8aIw112wLszE/aoCjCuLfXD719M+k0/OCZPHOk4F4dYxyvpu1Os/RpVzXMwvD mjJmvttpQcqUcqxICRIjFfTBcxQqeKFki/j/fi437TvHSAw6WnIzRGOYxZk/wxnf3bZG Q8EQTDJLSfA4kbH8NJZ4XRlKkegG0y8nnpuJdlVijbQ/v1ryErnX/vNUs1mKfjJrpG5D QYTjlmv7h4NDbcHYtitotUkCg9tpbpq4FVO8u+NYFJkh+hZZEip5CIYDGyuHbjJwSTjl 7GYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=h48Ay0pR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h69-20020a638348000000b00563f8ccc09asi2969305pge.390.2023.08.05.02.20.03; Sat, 05 Aug 2023 02:20:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=h48Ay0pR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229851AbjHEHiW (ORCPT + 99 others); Sat, 5 Aug 2023 03:38:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjHEHiU (ORCPT ); Sat, 5 Aug 2023 03:38:20 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94F794EC9; Sat, 5 Aug 2023 00:38:19 -0700 (PDT) Received: from localhost.localdomain (unknown [59.103.216.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 1FE4D66071AA; Sat, 5 Aug 2023 08:38:16 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691221098; bh=GzjRATlgGitRF0V9m5rFod6Kq8RaT1OYHkP3KnFTooY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h48Ay0pR0UV9/WSwc4+0lMrsMwIUfCl4GzGUXn6+PaSV4BSkhZvp9unn2QFxEO0SG iVlRR7jpaWuWBVd8wvBUfEbicVVmKv5AdYxyCVJP1ZLqJSiLl+wwl49r/OlzKvjFhB b+5LJlGcYAtFPP8s2bJjwu/8BGNYGyk2JmCEtKn0KeBxP4ldes+bPXd1iNRTnQ8pJu j98RGmG9ByHCj8jSZCtm+AeJSRcX769NyJVLUsAO90NF5RuHdOJ7NFA4xeYHYgWFCN CR5VXJIwxAgHYXpA9uRbTnftmxpzTqjMF1pfZGdlLMUc69ikKYmCcg4oZR4GE3VnnY wpl2g3/jyVRxw== From: Muhammad Usama Anjum To: Christian Brauner , Shuah Khan Cc: usama.anjum@collabora.com, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 2/6] selftests: clone3: remove duplicate defines Date: Sat, 5 Aug 2023 12:38:00 +0500 Message-Id: <20230805073809.1753462-2-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230805073809.1753462-1-usama.anjum@collabora.com> References: <20230805073809.1753462-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773380270141381994 X-GMAIL-MSGID: 1773380270141381994 Remove duplicate defines which are included in kernel headers. MAX_PID_NS_LEVEL macro is used inside kernel only. It isn't exposed to userspace. So it is never defined in test application. Remove #ifndef in this case. Signed-off-by: Muhammad Usama Anjum --- .../clone3/clone3_cap_checkpoint_restore.c | 2 -- .../testing/selftests/clone3/clone3_clear_sighand.c | 4 ---- tools/testing/selftests/clone3/clone3_selftests.h | 13 ------------- tools/testing/selftests/clone3/clone3_set_tid.c | 2 -- 4 files changed, 21 deletions(-) diff --git a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c b/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c index 52d3f0364bdaa..31b56d6256550 100644 --- a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c +++ b/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c @@ -27,9 +27,7 @@ #include "../kselftest_harness.h" #include "clone3_selftests.h" -#ifndef MAX_PID_NS_LEVEL #define MAX_PID_NS_LEVEL 32 -#endif static void child_exit(int ret) { diff --git a/tools/testing/selftests/clone3/clone3_clear_sighand.c b/tools/testing/selftests/clone3/clone3_clear_sighand.c index 47a8c0fc3676b..54a8b2445be99 100644 --- a/tools/testing/selftests/clone3/clone3_clear_sighand.c +++ b/tools/testing/selftests/clone3/clone3_clear_sighand.c @@ -16,10 +16,6 @@ #include "../kselftest.h" #include "clone3_selftests.h" -#ifndef CLONE_CLEAR_SIGHAND -#define CLONE_CLEAR_SIGHAND 0x100000000ULL -#endif - static void nop_handler(int signo) { } diff --git a/tools/testing/selftests/clone3/clone3_selftests.h b/tools/testing/selftests/clone3/clone3_selftests.h index e81ffaaee02ba..3d2663fe50ba5 100644 --- a/tools/testing/selftests/clone3/clone3_selftests.h +++ b/tools/testing/selftests/clone3/clone3_selftests.h @@ -15,10 +15,6 @@ #define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr))) -#ifndef CLONE_INTO_CGROUP -#define CLONE_INTO_CGROUP 0x200000000ULL /* Clone into a specific cgroup given the right permissions. */ -#endif - #ifndef __NR_clone3 #define __NR_clone3 -1 #endif @@ -32,18 +28,9 @@ struct __clone_args { __aligned_u64 stack; __aligned_u64 stack_size; __aligned_u64 tls; -#ifndef CLONE_ARGS_SIZE_VER0 -#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ -#endif __aligned_u64 set_tid; __aligned_u64 set_tid_size; -#ifndef CLONE_ARGS_SIZE_VER1 -#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */ -#endif __aligned_u64 cgroup; -#ifndef CLONE_ARGS_SIZE_VER2 -#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */ -#endif }; static pid_t sys_clone3(struct __clone_args *args, size_t size) diff --git a/tools/testing/selftests/clone3/clone3_set_tid.c b/tools/testing/selftests/clone3/clone3_set_tid.c index 0229e9ebb995e..ed785afb60770 100644 --- a/tools/testing/selftests/clone3/clone3_set_tid.c +++ b/tools/testing/selftests/clone3/clone3_set_tid.c @@ -23,9 +23,7 @@ #include "../kselftest.h" #include "clone3_selftests.h" -#ifndef MAX_PID_NS_LEVEL #define MAX_PID_NS_LEVEL 32 -#endif static int pipe_1[2]; static int pipe_2[2]; From patchwork Sat Aug 5 07:38:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 131459 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp343224vqr; Sat, 5 Aug 2023 01:46:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG9rb4KbVOdYdy/M1nbQBy3PJU3xu7K/ULAw6PltZf6PLk9ko8gASWUXnFjufcMdD4bfT/T X-Received: by 2002:a17:906:53d4:b0:99b:48d3:5488 with SMTP id p20-20020a17090653d400b0099b48d35488mr3349638ejo.24.1691225216605; Sat, 05 Aug 2023 01:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691225216; cv=none; d=google.com; s=arc-20160816; b=cW8kTvHHegsLUVAG3bhM7cvox+GJemc9fwdgc0iVK0r2lYvsJ1Dfhmq4nAZ0cfFyFC ZUr3XgYDDAIuCCgWwGjHPIbL6UB9n5SQ18WYDqbvomOgGjjrG4jwlDnKIKyfrgzDWgXC bkVx9T+83t65LDKSUW0xbNJJRzjjFFlMsMOmbLwZndjBhGQIoD/iBvudvRFJxdNnAEge vCiSzqBXHyXcc0EKwC3JMj2iHn99zxZql9d9Y3GBP28f3noLWumjg81xUPDexbIZZE7T 9s8cSe8OlirRgxjBsLqROrwr8IAzRWj9CcsI5sEVtij2AJ+IDOjKAwHhA4WdHUom/KmD ouVg== 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 :dkim-signature; bh=16hTsKLx9/xrkHxne1eDEQrv/qBVv2xcbGSjf0tFroo=; fh=75wuEtBkDdM9hKI3tsPHADTGAXOyE0eLpihrSICuDV8=; b=wbzA67InfHvbKK5pM/31rjfUVim5uH0U2gEJ5m0DaHf1Gykw7XdBwfBtTQJ3yOBl2U sd4QK0bNI4XnMRTJ7/A45KLmGNdjck5SwaXGNYhXRfprd8fpjN1d9Ey5u07eFHFLA/FV pvlGvGcrGMquaoeVdABUsgu2vZlQgUk2uMTmVSpZmOl9mYkifw6DzKbr5YYWp5bZJawV pPNgAIlndNUV7aoTVIDEZtq19ds9bNFiuU4ANAbOaFDI/0M3Fu/u7CDJjzCMI08iBT+l 91QlkY64yBlHpZIVh1TzAgTULPsZyQIRG9zwQ8nRgI6siW0CI2fbh5u92rbsprh5e6vX 6Y8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=atrGqXMk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h8-20020a170906398800b00993690d17a2si2912874eje.5.2023.08.05.01.46.31; Sat, 05 Aug 2023 01:46:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=atrGqXMk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229906AbjHEHib (ORCPT + 99 others); Sat, 5 Aug 2023 03:38:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbjHEHiY (ORCPT ); Sat, 5 Aug 2023 03:38:24 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9ADFB4ECF; Sat, 5 Aug 2023 00:38:23 -0700 (PDT) Received: from localhost.localdomain (unknown [59.103.216.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 3EB806607185; Sat, 5 Aug 2023 08:38:21 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691221102; bh=UmWF0qHTyv99gRWrKc/RIKIQrxbiZuVbIzpCSN6FSQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=atrGqXMkN+AtgaNplVz8DosvXtTQLxvnPv6S7gEywfe7Yl9DxAHK3eJleCEBTrpxQ WcPmdngzo86rHUEOBQDv6pvp10teM/l7wAR/W96KJig68hE+48MdmHmuPzvEWiQ9zd QcQUtGMyO4UAX4QKD9mFfXkcaAg5EdTty90hexbeMpO6abnqn1W5xIc4ID5s5ql7xo LmFDdOthx5fcw05nnpejQS/WDIqy7/giDdj0cdmypYXLt8Vt0wLNez5ZB1dlZwlq9g vAav1GB1G0jiYOgRx9vJ9+UD0f6+F+czLS9P8ao/dXBHmpPa4UYQ7/4DqHrekTmgjM 7P/tYUZhoUqBg== From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] selftests: core: remove duplicate defines Date: Sat, 5 Aug 2023 12:38:01 +0500 Message-Id: <20230805073809.1753462-3-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230805073809.1753462-1-usama.anjum@collabora.com> References: <20230805073809.1753462-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773378172750552659 X-GMAIL-MSGID: 1773378172750552659 Remove duplicate defines which are already defined in kernel headers and re-definition isn't required. Signed-off-by: Muhammad Usama Anjum --- .../testing/selftests/core/close_range_test.c | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c index 749239930ca83..534576f06df1c 100644 --- a/tools/testing/selftests/core/close_range_test.c +++ b/tools/testing/selftests/core/close_range_test.c @@ -16,34 +16,6 @@ #include "../kselftest_harness.h" #include "../clone3/clone3_selftests.h" -#ifndef __NR_close_range - #if defined __alpha__ - #define __NR_close_range 546 - #elif defined _MIPS_SIM - #if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */ - #define __NR_close_range (436 + 4000) - #endif - #if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */ - #define __NR_close_range (436 + 6000) - #endif - #if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */ - #define __NR_close_range (436 + 5000) - #endif - #elif defined __ia64__ - #define __NR_close_range (436 + 1024) - #else - #define __NR_close_range 436 - #endif -#endif - -#ifndef CLOSE_RANGE_UNSHARE -#define CLOSE_RANGE_UNSHARE (1U << 1) -#endif - -#ifndef CLOSE_RANGE_CLOEXEC -#define CLOSE_RANGE_CLOEXEC (1U << 2) -#endif - static inline int sys_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags) { From patchwork Sat Aug 5 07:38:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 131456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp341655vqr; Sat, 5 Aug 2023 01:41:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGCo6H84Uz8RzG1hfdepyZbpPilX7Xv3ClXDKnn/o9XbrDrDjt7j9LElRHz8Nt7OkXMif2Z X-Received: by 2002:a05:6a20:3219:b0:125:928d:6745 with SMTP id hl25-20020a056a20321900b00125928d6745mr1930731pzc.15.1691224897100; Sat, 05 Aug 2023 01:41:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691224897; cv=none; d=google.com; s=arc-20160816; b=lLSIAd1IiDv1zfmJy7AzqutgdfAWiyQqmGbwiVLE2T/I7O2U+Kk04hzBZ56C5efsbJ 2sXOubjlNfiu3snjSSuz6R9ooZZ5lXYmI6c3rUkrbK6oGYEB0fvJuECIQaB/Ivzh9ohs oJumpQA7Fo3jBxDtXp3G5RyGfPGENNEXxzm1ml3k7nPqEd8KpgIBtzrEbyqPzGOXR7mx H9LS949qu0Nbkwe90ZDxZYjqOg4/3rrOhf4J7GD7FIi7yidsEoQCvw1+x0EF7dqIsmaE Btdmam0RgX6zddULlEm6KoWSZAAJvraJBGazUJ+ZL625H2AsGQpLn5eHVY4XKxADQcpM sG0Q== 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 :dkim-signature; bh=rhBZNg/VhWeL0hrL5H90o4ou7cqTeJEBjv0987vggFQ=; fh=uY8hejRrhXFSf9IcIc44wm06KiZAtcQXc+tMvxMYLlw=; b=toAik0MF5y3XZ+jm3uyFBnRHHTPILlUfwzFqJUEHdnwPOz3dN1m/voEHDXy/F3vmFt UbeVVR6o08cYCGJazcBMJN7ruh05VJ9cMTE/El9XKGn+66qDjWqNtpUz1RJvs3YpXfqL 3jHz5CswKDdpWcxkta+oNeqzkoQ/otpgA2jOa4AOlE010+JG8B9Y6wudHT0E1cxRWtBh cKEDrw2to8TalYl+dP58E/gGfOvwXNPBHAv4mSucHBKTB/EmKLTmhRFn1FyfK+ngRGSE WvRW/Hc8SJ1M82i0qU+DpRlAHBgx/q8LOekpInPKSlBnmvTY7rLVwBEBbXIaN7YvNCOk rOYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=k2c6VFm8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p16-20020a056a000a1000b006797c2c00besi3021164pfh.144.2023.08.05.01.41.23; Sat, 05 Aug 2023 01:41:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=k2c6VFm8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229940AbjHEHiz (ORCPT + 99 others); Sat, 5 Aug 2023 03:38:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229876AbjHEHiq (ORCPT ); Sat, 5 Aug 2023 03:38:46 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6761F525A; Sat, 5 Aug 2023 00:38:35 -0700 (PDT) Received: from localhost.localdomain (unknown [59.103.216.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id AE42E6607185; Sat, 5 Aug 2023 08:38:32 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691221114; bh=In4FO/9lllojbgFO3Ya8vVojH0/z+2k6hIAGD5/ABPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2c6VFm8vaNWpSQmI7bqgpZztKbwhXY9nF4UrQHk/Gh3g/43pXLZSj+8vrQQTqRai n9gx4IUjluBs2E2AVi9ZG/ONbhctcZbdklyugqCha3VId5pUDlmhFGCRkyKtLX5vol RKbdKVkx2KvM/ZF1ghyM690ii3P7XUP2FKn82Uo7oees7sPj3IoNSwZxUTQUO/bupS RsOxpxrQLaz6lwC7ASRHKhOMvxSe1ywyxIvwseDU2ljpZd0eNeppC0oeKRdrgh7TCF 7upUDF6+F33wt7dKdRRgLS5XEQ8auuPmULYUAbCPjGzAAmo4rNHat1M+pRNi6J1n5V QUFLbkKhZ4Jmw== From: Muhammad Usama Anjum To: Shuah Khan , Alexey Gladkov , Muhammad Usama Anjum , Christian Brauner Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] selftests: fchmodat2: remove duplicate unneeded defines Date: Sat, 5 Aug 2023 12:38:02 +0500 Message-Id: <20230805073809.1753462-4-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230805073809.1753462-1-usama.anjum@collabora.com> References: <20230805073809.1753462-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773377837790969493 X-GMAIL-MSGID: 1773377837790969493 These duplicate defines should automatically be picked up from kernel headers. Use KHDR_INCLUDES to add kernel header files. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/fchmodat2/Makefile | 2 +- .../selftests/fchmodat2/fchmodat2_test.c | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/tools/testing/selftests/fchmodat2/Makefile b/tools/testing/selftests/fchmodat2/Makefile index 45b519eab8514..20839f8e43f2a 100644 --- a/tools/testing/selftests/fchmodat2/Makefile +++ b/tools/testing/selftests/fchmodat2/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later -CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined $(KHDR_INCLUDES) TEST_GEN_PROGS := fchmodat2_test include ../lib.mk diff --git a/tools/testing/selftests/fchmodat2/fchmodat2_test.c b/tools/testing/selftests/fchmodat2/fchmodat2_test.c index 2d98eb215bc6b..e0319417124d5 100644 --- a/tools/testing/selftests/fchmodat2/fchmodat2_test.c +++ b/tools/testing/selftests/fchmodat2/fchmodat2_test.c @@ -9,26 +9,6 @@ #include "../kselftest.h" -#ifndef __NR_fchmodat2 - #if defined __alpha__ - #define __NR_fchmodat2 562 - #elif defined _MIPS_SIM - #if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */ - #define __NR_fchmodat2 (452 + 4000) - #endif - #if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */ - #define __NR_fchmodat2 (452 + 6000) - #endif - #if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */ - #define __NR_fchmodat2 (452 + 5000) - #endif - #elif defined __ia64__ - #define __NR_fchmodat2 (452 + 1024) - #else - #define __NR_fchmodat2 452 - #endif -#endif - int sys_fchmodat2(int dfd, const char *filename, mode_t mode, int flags) { int ret = syscall(__NR_fchmodat2, dfd, filename, mode, flags); From patchwork Sat Aug 5 07:38:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 131451 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp331766vqr; Sat, 5 Aug 2023 01:10:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGESGNC8NFax/6BneyBwKaGONeYpXim93D1CuN3bXD7B6xGixTTuPO8bcC3hd5wrcSoFC5j X-Received: by 2002:a05:6870:4706:b0:1b0:73e0:97eb with SMTP id b6-20020a056870470600b001b073e097ebmr5036408oaq.30.1691223035596; Sat, 05 Aug 2023 01:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691223035; cv=none; d=google.com; s=arc-20160816; b=ehH3/OI82sUuiwdTSexNzW+VOtea8xTvyggYOCBy6wPqJf/LIga57KUHGiUmwQF0Kx CneG30CVk3HI4ul9ZOVJCo6z+19kEKsz5poq9JWUJun7BJytptBVfzZg/AjAry+uD0O5 XVZesFzdGKrLVJDHTnDqg7ouwyOPoZagOuY62bthposBUv2wjWLhQxk3gHGrqPkiXsxL xcMh99C3RuDPLLkNKlQyAIhgjInVL+JlC7G/nsqvt0xN9n5RwPIKXEQr4I5ThHKInCK9 sh7mhT+URE1GwfapSKFLvnGJMeeFH3VN9rwQ4MHAx2M1FohzPJSjmVaBKWTWrImIS2nr TR3g== 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 :dkim-signature; bh=gtVrxdWoHfhVgmdMLGIcDKM82urdeld9xgIM6whZfsY=; fh=75wuEtBkDdM9hKI3tsPHADTGAXOyE0eLpihrSICuDV8=; b=T0yFthSn9AZHekPdoAiqj97jtRcamlzRtjqRFw+lMF7sKkwnsmC4d+o1V3JNjAlfNm ve4RJJvWAhtDOCOgzektnNgnT6tmYMAV4g10MbPb/wbLpilDngj1xwxBm+Ta7AX2xxL9 2DS5ogqhutznX9zlLbknIjbSkTf+sDtj7fJLxWG5cO//OYNmYhi/iuYgh7GBrggatKqs qevFXlpoBMtNdV/694ZNWAWbXd7FQZ7MnEVH6si6EJUckSQiBxgf15WN1H5Hih6gzXAY GgQp7BlN6Yx7UI+wfS8uyQmiI9Ih6dkwqrjkH4dkJerDJT5CoNwvrlZiLeLNOOqJR/gf pQ5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=OIRFNufk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o19-20020a170903301300b001ac4f733007si2786854pla.549.2023.08.05.01.10.21; Sat, 05 Aug 2023 01:10:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=OIRFNufk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbjHEHjF (ORCPT + 99 others); Sat, 5 Aug 2023 03:39:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbjHEHix (ORCPT ); Sat, 5 Aug 2023 03:38:53 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C14F5276; Sat, 5 Aug 2023 00:38:40 -0700 (PDT) Received: from localhost.localdomain (unknown [59.103.216.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 1BD2866071AA; Sat, 5 Aug 2023 08:38:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691221118; bh=g8H4oqxUVkWw6eZ06fZTPFUc0jYvLduZPUtX7s5Dac4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OIRFNufk1KKzuIAX6Lefv4Jq+E4KIg5ZCK6YFLWzU9mQqSpYXkuvgoIpNkNy+jPyV qkMnqJWsV6AMFdvqfiXOuOXq08e6MFwPXlhVcvNjXS4RcDJQyyQrQh7OFNwZGCkKgi JQeKoe9xKavpMMgQ7XmmvyQlqXx+gszdQgrCK5x/FWtqbnu5wNysEVgmK6nRzo4/ac tCZV89fgSVLC3rg9wcBb3WHNUs8VY+fYJokurBxURk7TKfbPXuRRroOvhbdHhTexoI 9GsErEsTvXfPoJf/bJ18K8a31NQP//62vsEVp3yKjlxtlSXanDzn1Uu+ucEob00eCh 30jfNU7lQc4Dg== From: Muhammad Usama Anjum To: Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] selftests: firmware: remove duplicate unneeded defines Date: Sat, 5 Aug 2023 12:38:03 +0500 Message-Id: <20230805073809.1753462-5-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230805073809.1753462-1-usama.anjum@collabora.com> References: <20230805073809.1753462-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773375885775841987 X-GMAIL-MSGID: 1773375885775841987 These duplicate defines should automatically picked up from kernel headers. Signed-off-by: Muhammad Usama Anjum --- tools/testing/selftests/firmware/fw_namespace.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/testing/selftests/firmware/fw_namespace.c b/tools/testing/selftests/firmware/fw_namespace.c index 4c6f0cd83c5b0..04757dc7e5467 100644 --- a/tools/testing/selftests/firmware/fw_namespace.c +++ b/tools/testing/selftests/firmware/fw_namespace.c @@ -17,10 +17,6 @@ #include #include -#ifndef CLONE_NEWNS -# define CLONE_NEWNS 0x00020000 -#endif - static char *fw_path = NULL; static void die(char *fmt, ...) From patchwork Sat Aug 5 07:38:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Usama Anjum X-Patchwork-Id: 131453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp340953vqr; Sat, 5 Aug 2023 01:39:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElHk3BKm4ZnF/PWfoy1bXE6e8XMt9FaK8lGpk2s7OwBnvGJUcREDBxnoAqxaxc15dvct18 X-Received: by 2002:a05:6a20:ce83:b0:138:1980:1837 with SMTP id if3-20020a056a20ce8300b0013819801837mr4969859pzb.13.1691224746893; Sat, 05 Aug 2023 01:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691224746; cv=none; d=google.com; s=arc-20160816; b=Eml3T0mckX3SRUKBJQa6Yf4/m15IybTlDk+2byFCnTmaYum1e5cgYg75eB5IecirN1 Gu6KF4tVmBPFNWXp3Tqed1Kx6e4fXn1APRo16MND9itbadKXYwhsWvP/pJeaPlacOysR qBCI/WJrXP/0B9v0RmlCq0L0KyCXNee/WWEzWx6b25xyALTnN15fEgU/Q6vFAhbn7DZH vnqwwQL+Tz4ym19ney4MCGCixKI5v3hAKv5ieYepKJlJbzihI/JkEbI3FfRM1EOgEPAa Fwcq/u0USQNWnItgjIr/I0tXgM9ZyjwKWYNUBkeg3RAkRPf9W2e36fNdPc7Kz6MUEiEm 961g== 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 :dkim-signature; bh=SWYuMmvQxrE0C2Q58b7iOlLYsdHsEmARPJwt1wpumhg=; fh=PcoZMbcKYbKmj+QmqQl6TrBMUkld9iGMF6z7OuX15w8=; b=07RcaJ26ZmjlKdOiW5B3SdizV7IDILYQ9gxCgox/iIJw22rWOdkTIfvDidz2BcMMUn wJn6MiujwDusHk3Cgzwh0TYmE7Z+Jo7MJzVh5m3rRG3YCUSOpZoNe91vhw7fkzN5CDd+ 60sK4uu4mgxl2XuSpEapxUgA1VWspAnrku598bB2pWxmsOJZOKmlU5ikxE47z3gIkfvD T7OXWxYXvQ59aV13BrkVMZqHoLxuXR64GdhfxjG34PsDLDtb8bkC1ttt9ekQlfo0Hi5I MSbckEBM549CNlKoBmPgPQs+WL7FxxgO5siJNi78TNyAOwjXdeMbWaVZlwi6r/gWTnC/ /zOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="A74+WQJ/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g30-20020a63201e000000b00560132689ccsi2916193pgg.349.2023.08.05.01.38.53; Sat, 05 Aug 2023 01:39:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="A74+WQJ/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229990AbjHEHja (ORCPT + 99 others); Sat, 5 Aug 2023 03:39:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229919AbjHEHjH (ORCPT ); Sat, 5 Aug 2023 03:39:07 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95C565592; Sat, 5 Aug 2023 00:38:45 -0700 (PDT) Received: from localhost.localdomain (unknown [59.103.216.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madras.collabora.co.uk (Postfix) with ESMTPSA id 321B166071AB; Sat, 5 Aug 2023 08:38:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1691221123; bh=4K168XhtWURZ6JEq6/gnWN5amqD8CeZn6UF+Ktx7Q20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A74+WQJ/WMODJfBalTyPaAa6GodeMw339LFqEmP4CeJ/6BboV/8J+rpjplbyYsiJZ 1Za/TOXWRIumCHlFWFQmaqlGWGBwu0ay2UmP314XlpovQfG06uTA3qbpR40YEa4Ryn BU4u8JuSkLgg5QaMOTM6J6NazqR9rznUe6Xc2jhHYFx9GdxmMs30scpV35XlZ5nnhK K7giYk+HzPm758h83+syov82tH52Hs8qx/oV/M6x3RaHMzFFc7X2rsuMIB5Z9hhY1X KPZY/NxOx4lmxiBtMfNJhH28b2O0SSWd9r4KYI/f4trW/iXj4OtJ0BpGoKFk1It1vY waW74pbtMBiLg== From: Muhammad Usama Anjum To: Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso , =?utf-8?q?Andr=C3=A9_Almeida?= , Shuah Khan , Muhammad Usama Anjum Cc: kernel@collabora.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 6/6] selftests: futex: remove duplicate unneeded defines Date: Sat, 5 Aug 2023 12:38:04 +0500 Message-Id: <20230805073809.1753462-6-usama.anjum@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230805073809.1753462-1-usama.anjum@collabora.com> References: <20230805073809.1753462-1-usama.anjum@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773377680016847936 X-GMAIL-MSGID: 1773377680016847936 Kselftests are kernel tests and must be build with kernel headers from same source version. These duplicate defines should automatically picked up from kernel headers. Use KHDR_INCLUDES to add kernel header files. Signed-off-by: Muhammad Usama Anjum --- .../selftests/futex/include/futextest.h | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h index ddbcfc9b7bac4..59f66af3a6d10 100644 --- a/tools/testing/selftests/futex/include/futextest.h +++ b/tools/testing/selftests/futex/include/futextest.h @@ -25,28 +25,6 @@ typedef volatile u_int32_t futex_t; #define FUTEX_INITIALIZER 0 -/* Define the newer op codes if the system header file is not up to date. */ -#ifndef FUTEX_WAIT_BITSET -#define FUTEX_WAIT_BITSET 9 -#endif -#ifndef FUTEX_WAKE_BITSET -#define FUTEX_WAKE_BITSET 10 -#endif -#ifndef FUTEX_WAIT_REQUEUE_PI -#define FUTEX_WAIT_REQUEUE_PI 11 -#endif -#ifndef FUTEX_CMP_REQUEUE_PI -#define FUTEX_CMP_REQUEUE_PI 12 -#endif -#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE -#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ - FUTEX_PRIVATE_FLAG) -#endif -#ifndef FUTEX_REQUEUE_PI_PRIVATE -#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \ - FUTEX_PRIVATE_FLAG) -#endif - /** * futex() - SYS_futex syscall wrapper * @uaddr: address of first futex