Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2101860pxb; Mon, 12 Apr 2021 14:34:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAF0X0aUdtuNxTNTz7LmHXmotE2cE9G+xN7iK4LBjBKFSh8XumvPTzvsz6cUXYr/K4JhtQ X-Received: by 2002:aa7:c9cb:: with SMTP id i11mr16400678edt.219.1618263248596; Mon, 12 Apr 2021 14:34:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618263248; cv=none; d=google.com; s=arc-20160816; b=blqP3JAYigwJpGWd/54Jxb+QLTBmTtSUt4cGMC3/FR4SphPpgZ5HVGG2+jQ5cQSKNr 0V5/jzyyA9PHDGFkwR7Q2vP4CW6CMn++cNjLOt+z+7B4WwewzXihoyIrTYVKVZNVT9tk Gfb/stwKGhwrKpmAnt4jomLIwMoN+g7g4l8i3FtoOsGAljGgZT6Un7wuAktDqddXrQdf 0HIKpvJFfh5j6MRGMfGA9/HjtZNbavoGZE8+D+dv0G2AR9/HXgKbnj2IPApk8HC8LAO/ JILrpUkDUhXM1pnOJjajdp0aD0tlgbsbAt3RXeXnOwDFpN9v8opqe0946wCOw9PAKSKg 5SZw== 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=6Y4VhM6xHYg2vg7wXzTQ4ZPFN68qKXNHBM+X0eTBVUk=; b=hmZ3CycPYVLNS7JD+QzJDur5DmG7RohwIdFUawU7n4rIvcySP4/fX68qFYeQMB3yop F47owPipJRQakT/QGsxIczRneZGcBZEzxOxmQHhFZ1A0Lr7pu3sTYJwNAZk5bEMt6NTo KkYZQFAyvvN3eZL+rEytnojAsMCoft9ikUExRrZes6LZxUgzy7lJazHYiyHIz7Ut1b+p j3I+zPtTqtbCb3j1NdXL10h1wy1rfDW6yQ8O+g+eBcJ8ym62VJstndC9hlqNSUiBMRNq 8WouCuJtNSnw4vvbVKSLiVnqHFbQAgwpb0mcWue96q2s7jDHQWyGKv7MEggFJuGBJ5xI 7NTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=saK0qma4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 4si8793219edc.544.2021.04.12.14.33.45; Mon, 12 Apr 2021 14:34:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=saK0qma4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241462AbhDLJQQ (ORCPT + 99 others); Mon, 12 Apr 2021 05:16:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239029AbhDLI7A (ORCPT ); Mon, 12 Apr 2021 04:59:00 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 855D4C061358; Mon, 12 Apr 2021 01:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=6Y4VhM6xHYg2vg7wXzTQ4ZPFN68qKXNHBM+X0eTBVUk=; b=saK0qma469voeC3jirfWwV/g0Y hX1Uy78w/Nmb1zYgtEZR4pqclVzThV9O1uS7uGb4WWhRd7Kdw04Qu8d5IlB9nVPtfi7fPQcGVhgfj JEN7P+hgPuRVbFmF74puK3nK8q6jOelXYjWMbcVdpxBRl53dTkcluulOAYJB2jXRVw28qWU1bc0fn oExwwTbJTLExTcWKVVrQxgnt6buQ0O+6zQ62vE7BTs4ByA2ZFLVn4WmZrmGn0uhZaEMcIOuG+6t1K txCkxJRjoHFBBdQ/dilbs4y3b28bqKNiaEJB8HM/uHuKtY1E0dUhMUkDb9QSko8kVUtr/yK8PVSdZ xoWxKzmw==; Received: from [2001:4bb8:199:e2bd:3218:1918:85d1:2852] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lVsMI-0060DZ-64; Mon, 12 Apr 2021 08:55:50 +0000 From: Christoph Hellwig To: Catalin Marinas , Will Deacon , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Michael Ellerman , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , "David S. Miller" , x86@kernel.org, Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define Date: Mon, 12 Apr 2021 10:55:41 +0200 Message-Id: <20210412085545.2595431-2-hch@lst.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210412085545.2595431-1-hch@lst.de> References: <20210412085545.2595431-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index 9dc0bf0c5a6ee8..fb454bb629d114 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -203,7 +203,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -216,6 +215,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h index ac190958c98144..4a49d33ca4d55d 100644 --- a/tools/include/uapi/asm-generic/fcntl.h +++ b/tools/include/uapi/asm-generic/fcntl.h @@ -202,7 +202,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -215,6 +214,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ -- 2.30.1