From patchwork Mon Dec 18 06:29:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1061216dyi; Sun, 17 Dec 2023 22:31:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTqtRV387aLLO5p0ObO10Z5Ypvcn3MzE4l1+dPWddkZkmBy3PTh4zlNXj5x+z3yqoLSars X-Received: by 2002:a05:6808:3c99:b0:3b9:dfb9:ef76 with SMTP id gs25-20020a0568083c9900b003b9dfb9ef76mr25315377oib.10.1702881091025; Sun, 17 Dec 2023 22:31:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702881090; cv=none; d=google.com; s=arc-20160816; b=H3znXnqyKtjdyGFRs0Jht42DaRNwaU21UMM+C9T4ax9t9vqJCFB4QXGhx1Rkl8BzeN odhtC4/qe6SkcGNW8nzJdyw+o30WwVE1aOPRiwvbzBpWp6L03PWcHQMU67fARo+BrImR BRoaeFvnkceV+vQcdifbvRE/60BhXGbtF4F0+1RrqreHtgBdwCe5fFe7iK65xisPjEkl vQ25YiJlyW6TI3yh3qPDMAAWAYiw6p9mssMv3puMA2dwMn2Cmqe7Pp1PlZeKq6IARJW+ mLpanpt3FP/q/Rtz1ftMIFK9MpzKvu1D3bHh/Z+iy1fMFrJv4M6D/sTDK1Vnr+jeDpzI hv5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=VIr1Qg8hRwXOHwauYTH9ptmHgfQl036lsyUBTHTHMek=; fh=e0gwUwjkAxFLmLrbCKDdSk8Iw82/SVpoW6BkJj46ANE=; b=foJ7MHZMPcJYfL4misqGRy4CVi6SwE0hH7o2mHJsb/IiQ8Q6DI6FhIM9U9CV0MZlMC NvBeABAMAD3IvHO8crDrS9epj3QK2oceBZdM84d01l/kfeKRluGNCeEiC8vLyVDbFRXV 8lE0XseHvefPtXKXL4F1U9XaoXv0/452q/Lvfth1GZjeucf74cVemWelmLBisUST/Xo8 miv0mlaJmVPp2j1uWkFenNZ/iQn5VyaNzjPX5rrb+gQwycSEdDrIcsMfEXN+7iNYaprK YolVZCoMcxk8undcvAFr0P35GyXTsj8rPI5Lh//bPIe5HxQXjDpug/AdUKO/gK8XctBJ H7zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=kgVug3ij; spf=pass (google.com: domain of linux-kernel+bounces-3043-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3043-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id q13-20020a056a00084d00b006b7b42fe43asi17636474pfk.185.2023.12.17.22.31.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 22:31:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3043-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=kgVug3ij; spf=pass (google.com: domain of linux-kernel+bounces-3043-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3043-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 0909FB214B1 for ; Mon, 18 Dec 2023 06:29:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B88396FCF; Mon, 18 Dec 2023 06:29:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="kgVug3ij" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B8266FA2; Mon, 18 Dec 2023 06:29:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702880976; bh=VIr1Qg8hRwXOHwauYTH9ptmHgfQl036lsyUBTHTHMek=; h=Date:From:To:Cc:Subject:From; b=kgVug3ijdrFIK/vPvAJh6HwsiFTCxrDOYmrjy42PsNqz/V0wMZ2CU2rlBcZBmfuXJ vU+vEeonsmk0YeszVKXd7aNMXUTMDkHsxrHPRzRz/HFslUHIKkmYUuSA7cA8OFCfrt liQbSEmq3MM7qTeCwxhnVdeIuHY1zIr3Oz4OMVwllAQVBgXAa4hvV5kgIabzTDpBYC ZgwSrwfJtmqsNwBUdR4NAIKw2gDGGJlYwAhsv2AT+ZEKRZkZlvEaREAWsHtKJ6gKMO cQAkN68fl5FC9D7Dk0VFK22xXKDksZvKKPyKMGcuzKvA9bGPSAUMgd5tEwoDy/63lm 5gk8C79ujMYjQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (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) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Stqg42znVz4wch; Mon, 18 Dec 2023 17:29:36 +1100 (AEDT) Date: Mon, 18 Dec 2023 17:29:35 +1100 From: Stephen Rothwell To: Kent Overstreet Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the header_cleanup tree Message-ID: <20231218172935.0730d54c@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785600242762871964 X-GMAIL-MSGID: 1785600242762871964 Hi all, After merging the header_cleanup tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: In file included from include/linux/uaccess.h:12, from include/linux/uio.h:9, from include/linux/socket.h:8, from include/linux/compat.h:15, from arch/powerpc/kernel/asm-offsets.c:12: arch/powerpc/include/asm/uaccess.h: In function 'copy_mc_to_user': arch/powerpc/include/asm/uaccess.h:374:13: error: implicit declaration of function 'check_copy_size' [-Werror=implicit-function-declaration] 374 | if (check_copy_size(from, n, true)) { | ^~~~~~~~~~~~~~~ include/linux/uaccess.h: At top level: include/linux/uaccess.h:66:1: error: conflicting types for 'check_copy_size'; have 'bool(const void *, size_t, bool)' {aka '_Bool(const void *, long unsigned int, _Bool)'} 66 | check_copy_size(const void *addr, size_t bytes, bool is_source) | ^~~~~~~~~~~~~~~ arch/powerpc/include/asm/uaccess.h:374:13: note: previous implicit declaration of 'check_copy_size' with type 'int()' 374 | if (check_copy_size(from, n, true)) { | ^~~~~~~~~~~~~~~ cc1: some warnings being treated as errors Caused/exposed by commit f95cbe69154f ("thread_info, uaccess.h: Move HARDENED_USERCOPY to better location") I have reverted that commit for today. I then got this: arch/powerpc/kvm/book3s_64_vio.c: In function 'kvm_spapr_tce_release_iommu_group': arch/powerpc/kvm/book3s_64_vio.c:103:17: error: implicit declaration of function 'cond_resched_rcu'; did you mean 'cond_resched_lock'? [-Werror=implicit-function-declaration] 103 | cond_resched_rcu(); | ^~~~~~~~~~~~~~~~ | cond_resched_lock cc1: all warnings being treated as errors and this: arch/powerpc/kernel/interrupt.c: In function 'syscall_exit_prepare': arch/powerpc/kernel/interrupt.c:275:9: error: implicit declaration of function 'rseq_syscall'; did you mean 'si_syscall'? [-Werror=implicit-function-declaration] 275 | rseq_syscall(regs); | ^~~~~~~~~~~~ | si_syscall cc1: all warnings being treated as errors For which I applied this: From: Stephen Rothwell Date: Mon, 18 Dec 2023 17:26:13 +1100 Subject: [PATCH] fix up for some header_claenup patches Signed-off-by: Stephen Rothwell --- arch/powerpc/kernel/interrupt.c | 1 + arch/powerpc/kvm/book3s_64_vio.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c index c4f6d3c69ba9..94e9e2cdc557 100644 --- a/arch/powerpc/kernel/interrupt.c +++ b/arch/powerpc/kernel/interrupt.c @@ -4,6 +4,7 @@ #include #include #include /* for show_regs */ +#include #include #include diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index 14c6d7e318da..b569ebaa590e 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include