From patchwork Mon Jan 31 06:49:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 12730432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2F21C433FE for ; Mon, 31 Jan 2022 06:51:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bjzUhi9LlIrHntMPgFm/ZtAjTR2v94pGatL0ODMb4mc=; b=UZQo9xl4Bk5z0o 96OfISycB+7VWru3Q5/TZP2A5YbzkQrTx7XzzrMicN74ndSnQnPvgpT2bdorhA28h851Qr6YqVDDF aqN/aRxarNsubY9dR4psDNiuD+Lul5oHGryCex+MNLu82C5qitDTC5FPHTN7pcTZHQ9rvP1p6HrtA CA1yxjD4kvTU2zRhGc3MxVbp23Ucb1TfI2jOIPKw3ln9xdiOTl3xy5hGRktjluHjQiCzXxQyMYRui 7IRqHkyFzzXZ3MwGcM8FoGPBVDMC6wuYVKFObVeuSm8SDvQpvgQ1G3Dx/oLG8bULRduls29eqXOhk VZ0f7Nr1GfTA3VZeWFJw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nEQVa-008AWT-1s; Mon, 31 Jan 2022 06:49:50 +0000 Received: from [2001:4bb8:191:327d:13f5:1d0a:e266:6974] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nEQVP-008AUe-Oz; Mon, 31 Jan 2022 06:49:40 +0000 From: Christoph Hellwig To: Arnd Bergmann Cc: Guo Ren , x86@kernel.org, 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, 31 Jan 2022 07:49:29 +0100 Message-Id: <20220131064933.3780271-2-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131064933.3780271-1-hch@lst.de> References: <20220131064933.3780271-1-hch@lst.de> MIME-Version: 1.0 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Signed-off-by: Christoph Hellwig Reviewed-by: Guo Ren --- 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 ecd0f5bdfc1d6..caa482e3b01af 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -207,7 +207,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -220,6 +219,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 ac190958c9814..4a49d33ca4d55 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 */