From patchwork Sun Dec 27 02:44:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 11990489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 485CBC433E6 for ; Sun, 27 Dec 2020 02:46:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0C2632225E for ; Sun, 27 Dec 2020 02:46:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726130AbgL0Cpr (ORCPT ); Sat, 26 Dec 2020 21:45:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726105AbgL0Cpq (ORCPT ); Sat, 26 Dec 2020 21:45:46 -0500 Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53DF0C0613ED; Sat, 26 Dec 2020 18:45:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=nJoVIgJhKkmXydQo5rC30H4hVdYUU0JvjjaZLerNb2k=; b=vPkRrKoFmkchE3qxkJYzQNxW+g EcOZuSgy1FPMqBOUbAs8xpu3r9sOkRqnf/Z8MPYDOZMk35AkFu8i6yilyknNbpq4Jus0tFyFsla95 Fc/7nve0BGx0YmZfcZbgnhs24zNv/1rTkt8DL6aWsPxGkQoLO+cxC7gJr6zv57dcwhnhJ5V6wZp2N 6u8Qv4gFp3sgQkWgszpqNSE3SxfDIOKkY7d7K3nK7oNRwlm7PBJXXdhPuI9PXUUu70mViz76V5gRt +f+MCCPAwWiUzzAU+IXWheudQGysTloc7/DprRtrZxbzgUjpTafpueRnHh1eDGhSNnyRI/SpQWWGX oBqMK0WA==; Received: from [2601:1c0:6280:3f0::64ea] (helo=smtpauth.infradead.org) by merlin.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1ktM3D-0005zl-13; Sun, 27 Dec 2020 02:44:55 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Christoph Hellwig , Jens Axboe , linux-block@vger.kernel.org, Ley Foon Tan , Mark Salter , Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org, Peter Zijlstra , Masahiro Yamada , Andrew Morton Subject: [PATCH v2] local64.h: make mandatory Date: Sat, 26 Dec 2020 18:44:46 -0800 Message-Id: <20201227024446.17018-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Make mandatory in include/asm-generic/Kbuild and remove all arch/*/include/asm/local64.h arch-specific files since they only #include . This fixes build errors on arch/c6x/ and arch/nios2/ for block/blk-iocost.c. Build-tested on 21 of 25 arch-es. (tools problems on the others) Yes, we could even rename to and change all #includes to use instead. Signed-off-by: Randy Dunlap Suggested-by: Christoph Hellwig Cc: Jens Axboe Cc: linux-block@vger.kernel.org Cc: Ley Foon Tan Cc: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Cc: Peter Zijlstra Cc: Masahiro Yamada Cc: Andrew Morton Reviewed-by: Masahiro Yamada --- Would some $maintainer please plan to apply/merge this. v2: instead of making local64.h a generic-y header file and adding it to the missing arch/ header locations, make it a mandotory-y header file and remove it from most arch/ header locations. (Christoph) arch/alpha/include/asm/local64.h | 1 - arch/arc/include/asm/Kbuild | 1 - arch/arm/include/asm/Kbuild | 1 - arch/arm64/include/asm/Kbuild | 1 - arch/csky/include/asm/Kbuild | 1 - arch/h8300/include/asm/Kbuild | 1 - arch/hexagon/include/asm/Kbuild | 1 - arch/ia64/include/asm/local64.h | 1 - arch/m68k/include/asm/Kbuild | 1 - arch/microblaze/include/asm/Kbuild | 1 - arch/mips/include/asm/Kbuild | 1 - arch/nds32/include/asm/Kbuild | 1 - arch/openrisc/include/asm/Kbuild | 1 - arch/parisc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/Kbuild | 1 - arch/riscv/include/asm/Kbuild | 1 - arch/s390/include/asm/Kbuild | 1 - arch/sh/include/asm/Kbuild | 1 - arch/sparc/include/asm/Kbuild | 1 - arch/x86/include/asm/local64.h | 1 - arch/xtensa/include/asm/Kbuild | 1 - include/asm-generic/Kbuild | 1 + 22 files changed, 1 insertion(+), 21 deletions(-) --- linux-next-20201209.orig/include/asm-generic/Kbuild +++ linux-next-20201209/include/asm-generic/Kbuild @@ -34,6 +34,7 @@ mandatory-y += kmap_size.h mandatory-y += kprobes.h mandatory-y += linkage.h mandatory-y += local.h +mandatory-y += local64.h mandatory-y += mm-arch-hooks.h mandatory-y += mmiowb.h mandatory-y += mmu.h --- linux-next-20201209.orig/arch/arc/include/asm/Kbuild +++ linux-next-20201209/arch/arc/include/asm/Kbuild @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 generic-y += extable.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += user.h --- linux-next-20201209.orig/arch/arm64/include/asm/Kbuild +++ linux-next-20201209/arch/arm64/include/asm/Kbuild @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 generic-y += early_ioremap.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += qrwlock.h generic-y += qspinlock.h --- linux-next-20201209.orig/arch/arm/include/asm/Kbuild +++ linux-next-20201209/arch/arm/include/asm/Kbuild @@ -2,7 +2,6 @@ generic-y += early_ioremap.h generic-y += extable.h generic-y += flat.h -generic-y += local64.h generic-y += parport.h generated-y += mach-types.h --- linux-next-20201209.orig/arch/csky/include/asm/Kbuild +++ linux-next-20201209/arch/csky/include/asm/Kbuild @@ -2,7 +2,6 @@ generic-y += asm-offsets.h generic-y += gpio.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += qrwlock.h generic-y += qspinlock.h --- linux-next-20201209.orig/arch/h8300/include/asm/Kbuild +++ linux-next-20201209/arch/h8300/include/asm/Kbuild @@ -2,7 +2,6 @@ generic-y += asm-offsets.h generic-y += extable.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += spinlock.h --- linux-next-20201209.orig/arch/hexagon/include/asm/Kbuild +++ linux-next-20201209/arch/hexagon/include/asm/Kbuild @@ -2,5 +2,4 @@ generic-y += extable.h generic-y += iomap.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h --- linux-next-20201209.orig/arch/m68k/include/asm/Kbuild +++ linux-next-20201209/arch/m68k/include/asm/Kbuild @@ -2,6 +2,5 @@ generated-y += syscall_table.h generic-y += extable.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += spinlock.h --- linux-next-20201209.orig/arch/microblaze/include/asm/Kbuild +++ linux-next-20201209/arch/microblaze/include/asm/Kbuild @@ -2,7 +2,6 @@ generated-y += syscall_table.h generic-y += extable.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += syscalls.h --- linux-next-20201209.orig/arch/mips/include/asm/Kbuild +++ linux-next-20201209/arch/mips/include/asm/Kbuild @@ -6,7 +6,6 @@ generated-y += syscall_table_64_n64.h generated-y += syscall_table_64_o32.h generic-y += export.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += qrwlock.h --- linux-next-20201209.orig/arch/nds32/include/asm/Kbuild +++ linux-next-20201209/arch/nds32/include/asm/Kbuild @@ -4,6 +4,5 @@ generic-y += cmpxchg.h generic-y += export.h generic-y += gpio.h generic-y += kvm_para.h -generic-y += local64.h generic-y += parport.h generic-y += user.h --- linux-next-20201209.orig/arch/openrisc/include/asm/Kbuild +++ linux-next-20201209/arch/openrisc/include/asm/Kbuild @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 generic-y += extable.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += qspinlock_types.h generic-y += qspinlock.h --- linux-next-20201209.orig/arch/parisc/include/asm/Kbuild +++ linux-next-20201209/arch/parisc/include/asm/Kbuild @@ -3,6 +3,5 @@ generated-y += syscall_table_32.h generated-y += syscall_table_64.h generated-y += syscall_table_c32.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += user.h --- linux-next-20201209.orig/arch/powerpc/include/asm/Kbuild +++ linux-next-20201209/arch/powerpc/include/asm/Kbuild @@ -5,7 +5,6 @@ generated-y += syscall_table_c32.h generated-y += syscall_table_spu.h generic-y += export.h generic-y += kvm_types.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += qrwlock.h generic-y += vtime.h --- linux-next-20201209.orig/arch/riscv/include/asm/Kbuild +++ linux-next-20201209/arch/riscv/include/asm/Kbuild @@ -3,6 +3,5 @@ generic-y += early_ioremap.h generic-y += extable.h generic-y += flat.h generic-y += kvm_para.h -generic-y += local64.h generic-y += user.h generic-y += vmlinux.lds.h --- linux-next-20201209.orig/arch/s390/include/asm/Kbuild +++ linux-next-20201209/arch/s390/include/asm/Kbuild @@ -7,5 +7,4 @@ generated-y += unistd_nr.h generic-y += asm-offsets.h generic-y += export.h generic-y += kvm_types.h -generic-y += local64.h generic-y += mcs_spinlock.h --- linux-next-20201209.orig/arch/sh/include/asm/Kbuild +++ linux-next-20201209/arch/sh/include/asm/Kbuild @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 generated-y += syscall_table.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += parport.h --- linux-next-20201209.orig/arch/sparc/include/asm/Kbuild +++ linux-next-20201209/arch/sparc/include/asm/Kbuild @@ -6,5 +6,4 @@ generated-y += syscall_table_64.h generated-y += syscall_table_c32.h generic-y += export.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h --- linux-next-20201209.orig/arch/xtensa/include/asm/Kbuild +++ linux-next-20201209/arch/xtensa/include/asm/Kbuild @@ -2,7 +2,6 @@ generated-y += syscall_table.h generic-y += extable.h generic-y += kvm_para.h -generic-y += local64.h generic-y += mcs_spinlock.h generic-y += param.h generic-y += qrwlock.h --- linux-next-20201209.orig/arch/alpha/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include --- linux-next-20201209.orig/arch/ia64/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include --- linux-next-20201209.orig/arch/x86/include/asm/local64.h +++ /dev/null @@ -1 +0,0 @@ -#include