From patchwork Fri Mar 10 16:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 67536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp968773wrd; Fri, 10 Mar 2023 08:30:24 -0800 (PST) X-Google-Smtp-Source: AK7set8V5vVOc3aYBTMENz4t+zZpNoO66umokwKIpMtiO5LdTO4YDASN96QW2CoflTZ8dg+ycYTk X-Received: by 2002:a05:6a20:6982:b0:cd:ed5c:513 with SMTP id t2-20020a056a20698200b000cded5c0513mr4022252pzk.31.1678465824221; Fri, 10 Mar 2023 08:30:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678465824; cv=none; d=google.com; s=arc-20160816; b=wzNTZxSV4ohZXr4+g8U1Ldq2SPo58bopuRVhoC8GrInBZkekJDaJgZLVUnSOubnSvy i8uCllRE4w4LaFGhmT4Mm7mHDxC0bqmkLSmeXzN+d6Mp/qk9z6S+de5po3229u0j6RlZ 2SSy6HsaYGO6MXefhMwIQSlpnjGNamj0I4Ik3CVuUoJXBHfoZPP/BSB/CQjc5A08wrt+ VENa2VjibQXtJGpCcIfOJmO8a2Vdf6xST18GltxTn1Yk+PACwWUOKw2Eyhx6q6cO96Qf P81Eza+/DzYDJuqCrd1NywvoEERUYVjpp5hjPhZLtL+FBhuB9Rzh6OgM1sZfYj14p0Jr TjXQ== 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=muvL1GJq5JhedIkX9pwejhGqATSkcNKw4maG4yGCMnc=; b=JyXtFYR7GjTJ63FAHjkRv69gF46GwGkv4JkqJ0BxSr9yuldLXCK9AnSUMYpLC4vl2V CIxEX66Cf0AUHwyj7y6BCvlWGy1N284lKED5ANcU8mC5BtmnZh/e9x39CvOjDUlgZr5s lHBiPzhDZf/sSzxbYahEv1uuiZtZiaqf/TunOzFtP7jVRsSKCoK8kbYGJAzDDxBVylNS oMTv1SqPomQ5DPyPMVQl79UevGEWt3nKj1rGB5VqW5KZcfEZD88TegHcVqy7BVql4lJd 6B1gnwKiB9rqhQDa23jPRvACJh/9Iu7ZeVSwHe7WVtBQLE5Y7/eZurP/xl6iQmFlMYcN SPzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XOc0mSNd; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q1-20020aa78421000000b005a84b6ca956si29589pfn.315.2023.03.10.08.30.10; Fri, 10 Mar 2023 08:30:24 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=XOc0mSNd; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbjCJQOa (ORCPT + 99 others); Fri, 10 Mar 2023 11:14:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231633AbjCJQMe (ORCPT ); Fri, 10 Mar 2023 11:12:34 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0994111A98B for ; Fri, 10 Mar 2023 08:09:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=muvL1GJq5JhedIkX9pwejhGqATSkcNKw4maG4yGCMnc=; b=XOc0mSNdzPxDUyNWm5cGPWB4ziAtymfox2LdE3+31x4NspyNDNUr658/UDC+WqKg1QFF5/ 3dGj8qDrWT2McpJmUm0HzKLNyneHNV16SE79GM4M20yg4Igdt8ry+aquRKIUF+5EEgBHCP V9adyx9MJuH9CMyucirT/OHTmz5SvtU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-195-hRpnpB05NIajyxA6Omlh5Q-1; Fri, 10 Mar 2023 11:08:05 -0500 X-MC-Unique: hRpnpB05NIajyxA6Omlh5Q-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65E091C0758F; Fri, 10 Mar 2023 16:08:04 +0000 (UTC) Received: from thuth.com (unknown [10.45.224.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69892492B00; Fri, 10 Mar 2023 16:08:02 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Christoph Hellwig Subject: [PATCH v2 1/5] Move COMPAT_ATM_ADDPARTY to net/atm/svc.c Date: Fri, 10 Mar 2023 17:07:53 +0100 Message-Id: <20230310160757.199253-2-thuth@redhat.com> In-Reply-To: <20230310160757.199253-1-thuth@redhat.com> References: <20230310160757.199253-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759998979998626884?= X-GMAIL-MSGID: =?utf-8?q?1759998979998626884?= From: Palmer Dabbelt This used to be behind an #ifdef COMPAT_COMPAT, so most of userspace wouldn't have seen the definition before. Unfortunately this header file became visible to userspace, so the definition has instead been moved to net/atm/svc.c (the only user). Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Message-Id: <1447119071-19392-4-git-send-email-palmer@dabbelt.com> Reviewed-by: Arnd Bergmann Reviewed-by: Christoph Hellwig Signed-off-by: Thomas Huth --- include/uapi/linux/atmdev.h | 4 ---- net/atm/svc.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index a5c15cf23bd7..20b0215084fc 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -101,10 +101,6 @@ struct atm_dev_stats { /* use backend to make new if */ #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) /* add party to p2mp call */ -#ifdef CONFIG_COMPAT -/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ -#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) -#endif #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) /* drop party from p2mp call */ diff --git a/net/atm/svc.c b/net/atm/svc.c index 4a02bcaad279..d83556d8beb9 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -28,6 +28,11 @@ #include "signaling.h" #include "addr.h" +#ifdef CONFIG_COMPAT +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL + 4, struct compat_atm_iobuf) +#endif + static int svc_create(struct net *net, struct socket *sock, int protocol, int kern); From patchwork Fri Mar 10 16:07:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 67541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp972532wrd; Fri, 10 Mar 2023 08:37:11 -0800 (PST) X-Google-Smtp-Source: AK7set90/wYMP17HCCcUHIiQuFm4pLkthD6sQw5Os4PtgqaIlokBV23xf8PpB6cc0K4vSaZidesT X-Received: by 2002:a17:90b:33cc:b0:233:e0d5:a2b8 with SMTP id lk12-20020a17090b33cc00b00233e0d5a2b8mr7267382pjb.29.1678466231458; Fri, 10 Mar 2023 08:37:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678466231; cv=none; d=google.com; s=arc-20160816; b=i9oM1GktvpbunQFfNOeEsVubjtRnqMimli1uWlRLJpPn2F0WeZ4tMayFzIdgiWLY4g 6lx81A7lnb7bIo6rfVnK4qWD/v8MQz8x3yOwUcRZGtcGZJA7uNsJ+QuimHANOKfk0hfA TQl3ABalI2I7iGpTdN4gxOmnuy6FH6Es2fWhXxwW7vHSmCqHTryLphvCm/LxMixeNViy Am7lVC3ddAtz+AJoiCSRGa4HOvd9FK45lt9kW32k1tYTc0P+PrHh6cO5YHHqXM2Yi5va QqScYPxUdunwDdpnlJXYzobn20bNVZE4VZ0hT3dTL1Vzyrcog9//H8hhr9wgcGt8zFD0 CrVA== 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=//zLnPtP7ffouA+rSDdqgf7g3qQX7GQTNEvg0EWo8xg=; b=mqW0eAQ0wUy/qzkIKEX/wfyjjavPBKz8vAwyns8IUXTJ7ccB7gQssOwLgK2pNUfTbG BTixwMHs/UN1E7+S/35D2WdngIj24GdsbgCWNdofjCydyf9lg9sgC/2U6HA7BAPb2ZGu 7uf40el0xNtHiO8XcYKGBN7lrKaJXIEJGA6wFKq1LMIx97bVYR8UPbUQj7PXr3vtH7M5 j2Y4Jx/zPvtN7kVsKv8GZbyVGmQD4F32wQlzCDkzjTh+G5X2tj4SKzdGUeIqKnp8N7zt 9+SkO2jbIWeK/cdUIEnIXls/iMvrfv6UmQKei1zjXsI8vMmAPAF7Q21zhADb7C96Gggx HDpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cA2nIoF7; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l10-20020a17090a384a00b002296a8ff568si186762pjf.152.2023.03.10.08.36.58; Fri, 10 Mar 2023 08:37:11 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=cA2nIoF7; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232110AbjCJQOo (ORCPT + 99 others); Fri, 10 Mar 2023 11:14:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232228AbjCJQMj (ORCPT ); Fri, 10 Mar 2023 11:12:39 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44FB311C8CD for ; Fri, 10 Mar 2023 08:09:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=//zLnPtP7ffouA+rSDdqgf7g3qQX7GQTNEvg0EWo8xg=; b=cA2nIoF7Vknl492Pc293uNcTLEV30/h3UtaNuo3hOSfhPuD2RXqprM0kRHgC5AJ+e98aDu oO1ks7MG/vf9TGrYUyeL6GF0/MRywluQ7nvm+zeXb/zbPbyefQqe2S3XLMr0GyJRw4ctyM JqS850LvasHi9jxDrCEwMxc850KrsbI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-afljF5ZuNkeaMFMQAyeZBQ-1; Fri, 10 Mar 2023 11:08:08 -0500 X-MC-Unique: afljF5ZuNkeaMFMQAyeZBQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97EDA80418A; Fri, 10 Mar 2023 16:08:06 +0000 (UTC) Received: from thuth.com (unknown [10.45.224.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB616492C3E; Fri, 10 Mar 2023 16:08:04 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Christoph Hellwig Subject: [PATCH v2 2/5] Move ep_take_care_of_epollwakeup() to fs/eventpoll.c Date: Fri, 10 Mar 2023 17:07:54 +0100 Message-Id: <20230310160757.199253-3-thuth@redhat.com> In-Reply-To: <20230310160757.199253-1-thuth@redhat.com> References: <20230310160757.199253-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759999407227464679?= X-GMAIL-MSGID: =?utf-8?q?1759999407227464679?= From: Palmer Dabbelt This doesn't make any sense to expose to userspace, so it's been moved to the one user. This was introduced by commit 95f19f658ce1 ("epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled"). Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Message-Id: <1447119071-19392-7-git-send-email-palmer@dabbelt.com> [thuth: Rebased to fix contextual conflicts] Reviewed-by: Arnd Bergmann Reviewed-by: Christoph Hellwig Signed-off-by: Thomas Huth --- fs/eventpoll.c | 13 +++++++++++++ include/uapi/linux/eventpoll.h | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 64659b110973..e2a5d2cc9051 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -2042,6 +2042,19 @@ SYSCALL_DEFINE1(epoll_create, int, size) return do_epoll_create(0); } +#ifdef CONFIG_PM_SLEEP +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) +{ + if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND)) + epev->events &= ~EPOLLWAKEUP; +} +#else +static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) +{ + epev->events &= ~EPOLLWAKEUP; +} +#endif + static inline int epoll_mutex_lock(struct mutex *mutex, int depth, bool nonblock) { diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index e687658843b1..cfbcc4cc49ac 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -85,16 +85,4 @@ struct epoll_event { __u64 data; } EPOLL_PACKED; -#ifdef CONFIG_PM_SLEEP -static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) -{ - if ((epev->events & EPOLLWAKEUP) && !capable(CAP_BLOCK_SUSPEND)) - epev->events &= ~EPOLLWAKEUP; -} -#else -static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) -{ - epev->events &= ~EPOLLWAKEUP; -} -#endif #endif /* _UAPI_LINUX_EVENTPOLL_H */ From patchwork Fri Mar 10 16:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 67539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp972222wrd; Fri, 10 Mar 2023 08:36:37 -0800 (PST) X-Google-Smtp-Source: AK7set95tFp9MMXc16NpeW430A3YZHDDryjNtGZdZzTrNwhI5GuM2fmeVPTX9fYixrBfHulPJ0Fx X-Received: by 2002:a17:902:9a03:b0:19c:d505:cdba with SMTP id v3-20020a1709029a0300b0019cd505cdbamr22153217plp.62.1678466197507; Fri, 10 Mar 2023 08:36:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678466197; cv=none; d=google.com; s=arc-20160816; b=sP/f/tojHO++0zsDGnxJW/2Xk7Z9WDXJ8pFvpchR/Y52agzdKP+Spv92zT2c3JRbHR s2Of1RoWQbyA31W5ORUP+zPCYcMhUIpV0EVELqYbb1LdFOx/1BlIXJikVHLNwcFfQoaJ KLMhySoms5VbvGpX/844WHnZ53ibJDGoS3cd6Abmlk9l7N+AfPkL1FdpUr2OWKd1oTM8 /gSW91yDte8Ln9sIUQ1JjvTRWmFVKZ1TmZBDXJKGtp+8DEYD+410ZmdLs6jVgN31XLWT l5AWJYJ9gDnP3quEepCP8WqXoHHVAQRcBnNtVGeghuiXkoeEuWMNF9y0ixsuKG1kWO+s GugA== 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=6woSO0hLQ5AOX8ml8J8Kv2DAmsiAIUA/7xq1WhwbYPM=; b=oydYHjlP/memPnXSCYNd23Nw3PK4FYUKh3t7d0JYPMEzLLfJWgg/QfCi9SYERTgyDH oBiUBSXaW8J1KV9YAziWJHmLrbSj//F3VDPXeJbNnwVFDETeqNyUTDDB7IoH4waWfQEK h/ni37K4lqho+YJxjo+jvCQkKYDZ0TBmNI0PKjl7ze7Q7EHbRe4aflKloSwrk5jVridb vtPmQjX91nP2vAIgbAfpkYVCM+g0I1hGiiJOAu2TGNmBaRnS14SBEUp3xG76Qhb4Y3jr AgOgOIil5o0suwLjt5PPZ3pbAKQJqoRfhwqL1HERppOaY0QXSferm8pOXpwHIg4MT+67 vspg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B9ai03vc; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v6-20020a1709029a0600b0019ccdd9d745si331974plp.17.2023.03.10.08.36.25; Fri, 10 Mar 2023 08:36:37 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=B9ai03vc; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231517AbjCJQNw (ORCPT + 99 others); Fri, 10 Mar 2023 11:13:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbjCJQMY (ORCPT ); Fri, 10 Mar 2023 11:12:24 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBF59118808 for ; Fri, 10 Mar 2023 08:09:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6woSO0hLQ5AOX8ml8J8Kv2DAmsiAIUA/7xq1WhwbYPM=; b=B9ai03vccdA3Uj8Z4vu7j0aqdYs0yYruFN691C9K+t2WDqFdD4jkdfA9neHgs0WDoRfPtj FJSWBOkd77x9CmaHBI10+GK71UTK4k6uWpCPkb0eRHPMpipKFefBUvsJGqLjts2eK55r8R Zn2IbCWXmvVxa2wxnHckLVcmdrQeezA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-47-HSShDvcENL6mqIOrmek3JA-1; Fri, 10 Mar 2023 11:08:14 -0500 X-MC-Unique: HSShDvcENL6mqIOrmek3JA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2559882824; Fri, 10 Mar 2023 16:08:08 +0000 (UTC) Received: from thuth.com (unknown [10.45.224.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6A5F492B00; Fri, 10 Mar 2023 16:08:06 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Christoph Hellwig Subject: [PATCH v2 3/5] Move bp_type_idx to include/linux/hw_breakpoint.h Date: Fri, 10 Mar 2023 17:07:55 +0100 Message-Id: <20230310160757.199253-4-thuth@redhat.com> In-Reply-To: <20230310160757.199253-1-thuth@redhat.com> References: <20230310160757.199253-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759999371449945033?= X-GMAIL-MSGID: =?utf-8?q?1759999371449945033?= From: Palmer Dabbelt This has a "#ifdef CONFIG_*" that used to be exposed to userspace. The names in here are so generic that I don't think it's a good idea to expose them to userspace (or even the rest of the kernel). There are multiple in-kernel users, so it's been moved to a kernel header file. Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Message-Id: <1447119071-19392-10-git-send-email-palmer@dabbelt.com> [thuth: Remove it also from tools/include/uapi/linux/hw_breakpoint.h] Reviewed-by: Arnd Bergmann Reviewed-by: Christoph Hellwig Signed-off-by: Thomas Huth --- include/linux/hw_breakpoint.h | 10 ++++++++++ include/uapi/linux/hw_breakpoint.h | 10 ---------- tools/include/uapi/linux/hw_breakpoint.h | 10 ---------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h index f319bd26b030..7fbb45911273 100644 --- a/include/linux/hw_breakpoint.h +++ b/include/linux/hw_breakpoint.h @@ -7,6 +7,16 @@ #ifdef CONFIG_HAVE_HW_BREAKPOINT +enum bp_type_idx { + TYPE_INST = 0, +#if defined(CONFIG_HAVE_MIXED_BREAKPOINTS_REGS) + TYPE_DATA = 0, +#else + TYPE_DATA = 1, +#endif + TYPE_MAX +}; + extern int __init init_hw_breakpoint(void); static inline void hw_breakpoint_init(struct perf_event_attr *attr) diff --git a/include/uapi/linux/hw_breakpoint.h b/include/uapi/linux/hw_breakpoint.h index 965e4d8606d8..1575d3ca6f0d 100644 --- a/include/uapi/linux/hw_breakpoint.h +++ b/include/uapi/linux/hw_breakpoint.h @@ -22,14 +22,4 @@ enum { HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X, }; -enum bp_type_idx { - TYPE_INST = 0, -#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS - TYPE_DATA = 0, -#else - TYPE_DATA = 1, -#endif - TYPE_MAX -}; - #endif /* _UAPI_LINUX_HW_BREAKPOINT_H */ diff --git a/tools/include/uapi/linux/hw_breakpoint.h b/tools/include/uapi/linux/hw_breakpoint.h index 965e4d8606d8..1575d3ca6f0d 100644 --- a/tools/include/uapi/linux/hw_breakpoint.h +++ b/tools/include/uapi/linux/hw_breakpoint.h @@ -22,14 +22,4 @@ enum { HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X, }; -enum bp_type_idx { - TYPE_INST = 0, -#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS - TYPE_DATA = 0, -#else - TYPE_DATA = 1, -#endif - TYPE_MAX -}; - #endif /* _UAPI_LINUX_HW_BREAKPOINT_H */ From patchwork Fri Mar 10 16:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 67532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp967642wrd; Fri, 10 Mar 2023 08:28:21 -0800 (PST) X-Google-Smtp-Source: AK7set+yNnKqvYRRh40sYMQ6nVi2iiLRGLokpeziBBbiLOnnnqQsmVOE26YH0Awka85G2QmLsoR2 X-Received: by 2002:a17:903:2441:b0:19e:85e8:f78d with SMTP id l1-20020a170903244100b0019e85e8f78dmr31636011pls.65.1678465701161; Fri, 10 Mar 2023 08:28:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678465701; cv=none; d=google.com; s=arc-20160816; b=TaogjqaPajwXKSyg21NWe6Cif5HkzgrET7sq+boFSviDW5pGCFoWHASSb5bu2iGrMQ YUgBise+bNkyNIatg6q5RWXM5FwGZxGfEaQc6dmwxBTo6S4PJVZSmkUDrj8hHLJG1VRU 0dDAaCL/lGGI1dyTMPBBvU1GTm1S0KdJaCRWDjJbpR3wrFJKi4CpUguk19howBHXZnYR Nsr5wlAtgRWaGJ5vYurlKVx5u4e50hhv3qLiuXjTdllhfC5UpKDTyJoXLJzpa+kVvq6b ReDvj9kHFmDEBXhP+VT1iV2a+irjbolyCOP19qYtBM90Hh5zmTaPUNIixVpD2HfQpgr3 0wrQ== 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=uORM3Xhzjyx5pSXtVFHzrrBAkab8IB4YL2yYQbG2PCU=; b=ebqlX3L4xuY+DihQQnA1QKQ/D0jjmoMkrwqQOwZxvV4ifbXESP0yaOP7AKWSFWd/oR wszbmTi5UyHfGSXqjooNkhVOhWS1YkKGY8CmsPjpimeizmkrrkqyZodSlJ9y9Ior2zep 6383ke1be8q+aUQ2MuAq1mJBBh/OFsHFXd1/Sxox9FPR1GPmhE4yG6tAcYNjzJXdA1k8 ZtB2WHXiJ8/vlAZZ5EjvBMCOq1ItUhvTAQbzmiYv7fu2eTKt5r1T6cblLWp7dMpxINlm 2M0+2eFbs+JBT/zOKojWyPcQDQrswTUz8S+vm0x9T7FHOCpU0Jkcs+VEIB5DaMlc/CNh goyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BP7Nw5QY; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n4-20020a170902d2c400b0019b0c65027csi260018plc.620.2023.03.10.08.28.08; Fri, 10 Mar 2023 08:28:21 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=BP7Nw5QY; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230415AbjCJQQM (ORCPT + 99 others); Fri, 10 Mar 2023 11:16:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229945AbjCJQNG (ORCPT ); Fri, 10 Mar 2023 11:13:06 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D04D11EE95 for ; Fri, 10 Mar 2023 08:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uORM3Xhzjyx5pSXtVFHzrrBAkab8IB4YL2yYQbG2PCU=; b=BP7Nw5QYbL+59j3DCNKdvyUh42RsjQOGufLzCXfan4Q5xl4KFPkYzUf1zRZt/DAdXHeX4f tLbMBCexKrUXfem/IikS1gX+zEZykKHccWL8PkrBU0VVyI/UxKgDFqZrVBepm9S90kcD2p XpDUlz0KZHGBdbGgatcZ0N84kX3l+To= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-627-vhIr2a09NJ-Bi14QG2KogA-1; Fri, 10 Mar 2023 11:08:11 -0500 X-MC-Unique: vhIr2a09NJ-Bi14QG2KogA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00B1938041DD; Fri, 10 Mar 2023 16:08:11 +0000 (UTC) Received: from thuth.com (unknown [10.45.224.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE54C492C3E; Fri, 10 Mar 2023 16:08:08 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Christoph Hellwig Subject: [PATCH v2 4/5] pktcdvd: Remove CONFIG_CDROM_PKTCDVD_WCACHE from uapi header Date: Fri, 10 Mar 2023 17:07:56 +0100 Message-Id: <20230310160757.199253-5-thuth@redhat.com> In-Reply-To: <20230310160757.199253-1-thuth@redhat.com> References: <20230310160757.199253-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759998850904506640?= X-GMAIL-MSGID: =?utf-8?q?1759998850904506640?= CONFIG_* switches should not be exposed in uapi headers, thus let's get rid of the USE_WCACHING macro here (which was also named way to generic) and integrate the logic directly in the only function that needs it. Suggested-by: Christoph Hellwig Signed-off-by: Thomas Huth Reviewed-by: Christoph Hellwig --- drivers/block/pktcdvd.c | 13 +++++++++---- include/uapi/linux/pktcdvd.h | 11 ----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 2f1a92509271..5ae2a80db2c3 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -1869,12 +1869,12 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd) /* * enable/disable write caching on drive */ -static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd, - int set) +static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd) { struct packet_command cgc; struct scsi_sense_hdr sshdr; unsigned char buf[64]; + bool set = IS_ENABLED(CONFIG_CDROM_PKTCDVD_WCACHE); int ret; init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ); @@ -1890,7 +1890,12 @@ static noinline_for_stack int pkt_write_caching(struct pktcdvd_device *pd, if (ret) return ret; - buf[pd->mode_offset + 10] |= (!!set << 2); + /* + * use drive write caching -- we need deferred error handling to be + * able to successfully recover with this option (drive will return good + * status as soon as the cdb is validated). + */ + buf[pd->mode_offset + 10] |= (set << 2); cgc.buflen = cgc.cmd[8] = 2 + ((buf[0] << 8) | (buf[1] & 0xff)); ret = pkt_mode_select(pd, &cgc); @@ -2085,7 +2090,7 @@ static int pkt_open_write(struct pktcdvd_device *pd) return -EIO; } - pkt_write_caching(pd, USE_WCACHING); + pkt_write_caching(pd); ret = pkt_get_max_speed(pd, &write_speed); if (ret) diff --git a/include/uapi/linux/pktcdvd.h b/include/uapi/linux/pktcdvd.h index 9cbb55d21c94..6a5552dfd6af 100644 --- a/include/uapi/linux/pktcdvd.h +++ b/include/uapi/linux/pktcdvd.h @@ -29,17 +29,6 @@ */ #define PACKET_WAIT_TIME (HZ * 5 / 1000) -/* - * use drive write caching -- we need deferred error handling to be - * able to successfully recover with this option (drive will return good - * status as soon as the cdb is validated). - */ -#if defined(CONFIG_CDROM_PKTCDVD_WCACHE) -#define USE_WCACHING 1 -#else -#define USE_WCACHING 0 -#endif - /* * No user-servicable parts beyond this point -> */ From patchwork Fri Mar 10 16:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 67538 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp972102wrd; Fri, 10 Mar 2023 08:36:25 -0800 (PST) X-Google-Smtp-Source: AK7set+IYq3rilC/rDTg94vWP8dc6wKHMV5bUen0B8cD0QI0Phf/8p3gsOq7qLmoSAM3KfeJXjiL X-Received: by 2002:a17:902:d549:b0:19c:be09:20d5 with SMTP id z9-20020a170902d54900b0019cbe0920d5mr28150847plf.11.1678466185185; Fri, 10 Mar 2023 08:36:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678466185; cv=none; d=google.com; s=arc-20160816; b=Z/39O2INHEVuKXCARP+c/uAIm8dANobZ9soYvohc8Muky+C0/FNWHsO0Nypg9HB99D zh2pqoSLRfIShDLi6S23vV/kz0UNFVBk0k276qGDcOpKhGoxqxaIreCfuAZnaOgynK23 uqgFNI4Jc3nLJaOGF0oaMlhHjAvK7s/SPEm8OxfvhyP+G3lHUIC+zeu8DLQVQip5xEYZ NyIHVrIBIQZGnRXDxVQIy9OEDSyxvXya5A7w567lxTGSZgiRZrjdJveBNxxvDDBnfFKd HcosEFgfupG6tO4KSxUMN1D7GR39CiM60DJaUuAgtuS+k+82x01U+BWciGwWH4SY/69/ 7xxA== 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=VF7DOSFSoxperMCR1c0beoAVNr9jhMKzR2GYQ6m9DTA=; b=mI4C013JZesNxDaJRYOMGfExli7YdHiuEqmV7FaDlhXnca2nzoDS2g/zBBLraW+4Jb x8whMg0pujoo9PVMb5uY5Ec5bOgF++i68lUDI8Io6eTrCcG2kvKr7EZOmdPAMf6OHJ/6 mcJifu8RnTKNZ0tfAQXStg+286MMaHxmHnryyb3EjOAUAhZoLGccWQn6Wt2OzhgKukJb bTD0b9Ald3C3p4hRhtwacrFk7DjjwRGCw6+PokfHD+vjQNgQXIbrsqlQL9ipaWyCfTJ7 FM04EgVIibVqNim0xNV6r8ALhw2bRssvLIOTbpsd5tSQ64cADdvAi2/ofBacu0tplcFJ o4gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BCH2AVUN; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a170902f55100b0019a736765edsi350756plf.130.2023.03.10.08.36.13; Fri, 10 Mar 2023 08:36:25 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=BCH2AVUN; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230246AbjCJQQI (ORCPT + 99 others); Fri, 10 Mar 2023 11:16:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230409AbjCJQMv (ORCPT ); Fri, 10 Mar 2023 11:12:51 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C53B1816B for ; Fri, 10 Mar 2023 08:09:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VF7DOSFSoxperMCR1c0beoAVNr9jhMKzR2GYQ6m9DTA=; b=BCH2AVUNmM6vAIHwdOLIkRb5ovb7cgyWVhtXQ8fnxPK9ldYzoPQKRTW5+mjx9UjF5/msJy AlMU89VwpP2njdZAAYGdHmp4Ub+4bsK37q9/SyPGfdL60ROnCYAzQJ20Hqtnzia/WuRjUI Nw+e5u5pzmO667dERnWroMQTnUcz/sY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-0nmZr2faN_Ob6cqxJso-SQ-1; Fri, 10 Mar 2023 11:08:14 -0500 X-MC-Unique: 0nmZr2faN_Ob6cqxJso-SQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 612A3185A794; Fri, 10 Mar 2023 16:08:13 +0000 (UTC) Received: from thuth.com (unknown [10.45.224.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C0A2492C3E; Fri, 10 Mar 2023 16:08:11 +0000 (UTC) From: Thomas Huth To: linux-kernel@vger.kernel.org, Arnd Bergmann Cc: linux-arch@vger.kernel.org, Chas Williams <3chas3@gmail.com>, Palmer Dabbelt , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Christoph Hellwig Subject: [PATCH v2 5/5] scripts: Update the CONFIG_* ignore list in headers_install.sh Date: Fri, 10 Mar 2023 17:07:57 +0100 Message-Id: <20230310160757.199253-6-thuth@redhat.com> In-Reply-To: <20230310160757.199253-1-thuth@redhat.com> References: <20230310160757.199253-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759999358241750727?= X-GMAIL-MSGID: =?utf-8?q?1759999358241750727?= The file in include/uapi/linux/ have been cleaned in the previous patches, so we can now remove these entries from the CONFIG_* ignore-list. Signed-off-by: Thomas Huth --- scripts/headers_install.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh index 4041881746ad..36b56b746fce 100755 --- a/scripts/headers_install.sh +++ b/scripts/headers_install.sh @@ -83,10 +83,6 @@ arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64 arch/x86/include/uapi/asm/mman.h:CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS -include/uapi/linux/atmdev.h:CONFIG_COMPAT -include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP -include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS -include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE " for c in $configs