From patchwork Tue Jun 20 04:53:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 110257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3454916vqr; Mon, 19 Jun 2023 23:06:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zUCxGEMHIdECeTZLu9RZISei8lO3qHYRZndyRSq4vgVt7uUfZPOE7cbnLPdqUNawfFZH9 X-Received: by 2002:a05:6359:a26:b0:12c:9960:ec1e with SMTP id el38-20020a0563590a2600b0012c9960ec1emr5427163rwb.19.1687241195233; Mon, 19 Jun 2023 23:06:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241195; cv=none; d=google.com; s=arc-20160816; b=HuUqFEp0Jfi2zd8B+EojNcHg9q9dL0c78KejJAbGONgc6t5rEiZF9fbEmcKllFlze8 wfXYTrX4ptOGMxokNtvLcx6oRPYJ5OeUe5FPM8dfY5egjOnERFXPOWBmB+/Kd4jIjAhD FIIMIu916A9Qzjlh/wrMRdsg3fQOk50c0E2Q11rKoxQQmZrBYvULLHndHb6daOoSu8FA wMJ8vkhAcjGPBBjhnYotiL/A93KYDqz8kXJFqrx23fwHZprBVut90TwO24nFRuJSjOJP fDMpAJ7tzHPIPGDlIYAakcXw7V4TMXV167Y4BiE9l7Upm7Vh2nSY3XDq28evRdjSpVdz QFxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=suI4KpgbK5VrndPgV8n5VWkerfSeVjf7EIddwu6JhPE=; b=us8jk0OP1KcLiWeM4SvLzE6GX2vnbQ14fKwJkTgfUVTBCYXeymZJyT0dSGMSnVgfmw mHUBioF8ky+whKiW8yeEb856+LdUET+R7PMDmS9qx0Hv50S/VTxQaycaGRv4Z0Voak5n w2Eli2DQkW6zeUuPQMXc/LDSh/meSGD88EovAEf9tTRy+PbthG/cKKjx5c1c85HZPqSH sQRp5k6fnRMWscv2EGR0WrUSAU7rl+mE8qeDW4Mdzprhf+mdJUlRdmjJHF0m7816Ej1G x16VyxFZozMy7iEKVIjC1mIdXCli8CUToofGtjYODdCW6xJKa8Z4F3uirtHwJpdlWqUT e1Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=FtaTnuHy; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs123-20020a632881000000b00542ad648fbasi995551pgb.188.2023.06.19.23.06.20; Mon, 19 Jun 2023 23:06:35 -0700 (PDT) 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=@canb.auug.org.au header.s=201702 header.b=FtaTnuHy; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230170AbjFTEyF (ORCPT + 99 others); Tue, 20 Jun 2023 00:54:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230015AbjFTEyE (ORCPT ); Tue, 20 Jun 2023 00:54:04 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D758C6; Mon, 19 Jun 2023 21:54:02 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QlZ6H3YwSz4wjF; Tue, 20 Jun 2023 14:53:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687236840; bh=suI4KpgbK5VrndPgV8n5VWkerfSeVjf7EIddwu6JhPE=; h=Date:From:To:Cc:Subject:From; b=FtaTnuHyEJ7LsLOTF6Ajy1Lo+1lKGhRP2cEcSN1+BH66o3IBGrLApaqL4pqpzmmlF Rbh3Mwa0YXEapbFTdIykAt6VDScYBfrnO9XT/9tkxySqS9e8FLUn3PV/4E2PV+VCwp blkkW8Ov+1nrj6W/8gKV9zLm0WHFNWcZBLahvNesPt+BHSv7wmWEIO0PqoDcVCkLK1 qW4Lnu/K9ZpjoCmef5RsEswwZWeXyyStJ0xIhiI7N22o+0R9eTl5EbUyODcrH5T1rZ 85EtseqiyIIIEjAwpj2vkkLCWheBjP1+XPPPwRN0OMLSXPEcYJxA7lXgxAUkZwZP72 7t95DTZicKpVQ== Date: Tue, 20 Jun 2023 14:53:57 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Andrew Morton Cc: Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the tip tree Message-ID: <20230620145357.12d6b23f@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham 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?1769200623407916096?= X-GMAIL-MSGID: =?utf-8?q?1769200623407916096?= Hi all, After merging the tip tree, today's linux-next build (x86_64 allnoconfig) failed like this: In file included from include/linux/mem_encrypt.h:17, from arch/x86/include/asm/page_types.h:7, from arch/x86/include/asm/page.h:9, from arch/x86/include/asm/thread_info.h:12, from include/linux/thread_info.h:60, from arch/x86/include/asm/preempt.h:9, from include/linux/preempt.h:78, from include/linux/spinlock.h:56, from include/linux/swait.h:7, from include/linux/completion.h:12, from include/linux/crypto.h:15, from arch/x86/kernel/asm-offsets.c:9: arch/x86/include/asm/mem_encrypt.h:23:20: error: static declaration of 'mem_encrypt_init' follows non-static declaration 23 | static inline void mem_encrypt_init(void) { } | ^~~~~~~~~~~~~~~~ In file included from include/linux/printk.h:6, from include/linux/kernel.h:30, from arch/x86/include/asm/percpu.h:27, from arch/x86/include/asm/preempt.h:6: include/linux/init.h:158:6: note: previous declaration of 'mem_encrypt_init' with type 'void(void)' 158 | void mem_encrypt_init(void); | ^~~~~~~~~~~~~~~~ Caused by commits 439e17576eb4 ("init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()") 0a9567ac5e6a ("x86/mem_encrypt: Unbreak the AMD_MEM_ENCRYPT=n build") from the tip tree interacting with commit ad1a48301f65 ("init: consolidate prototypes in linux/init.h") From the mm tree. I have applied the following merge fix patch for today (but I think it can be consolidated into the mm tree commit - along with removing the parts that remove this declaration from elsewhere). From: Stephen Rothwell Date: Tue, 20 Jun 2023 14:30:52 +1000 Subject: [PATCH] fix up for "init: consolidate prototypes in linux/init.h" interacting with commits 439e17576eb4 ("init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()") 0a9567ac5e6a ("x86/mem_encrypt: Unbreak the AMD_MEM_ENCRYPT=n build") from the tip tree. Signed-off-by: Stephen Rothwell --- include/linux/init.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/init.h b/include/linux/init.h index 1200fa99e848..266c3e1640d4 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -155,7 +155,6 @@ void __init init_rootfs(void); void init_IRQ(void); void time_init(void); -void mem_encrypt_init(void); void poking_init(void); void pgtable_cache_init(void);