From patchwork Wed Jun 28 19:03:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 114031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9158762vqr; Wed, 28 Jun 2023 12:29:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5yzg1K76q9V8kaZU6w69eUBr8CIc5CRiTUnSe/RC9JrG2EYbi6NNyawQzCHgEreikV3emN X-Received: by 2002:a17:902:d509:b0:1af:a349:3f31 with SMTP id b9-20020a170902d50900b001afa3493f31mr43531136plg.3.1687980568555; Wed, 28 Jun 2023 12:29:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687980568; cv=none; d=google.com; s=arc-20160816; b=gZZ0msQN9b6x5zC/0DZ7RtPuxIQkR5KWgZZoIEIm39zAzLEgw2YFmYoYtyqUEJmCgk iUXxO85eZrJZ/Qy4yCIcx8A9cXSOtnJLOpqOMfPMjTg9DidChZhDN6apsdv7LEM54QVw lwZhU/tqidwRev3d1mDzh/1Mi0D3NHJPsiqZXO6bm5BxhYwIDidAxwapfNuyuM/3BkgM 0EppTYfyz7/Oa4R58rnQten0LZxlbZBNDBiKTQy9DRQfo0mVwF5kYTgKJJ1mHBk4DTIK 1PgoPAcfIvzMux9skOkHKSWfrkNg7yCiNCVmNgpqxhe466N/SFU6LIlfH1BluGL2jDj5 IPmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=lKbs9JhRzstdbx99oJHX0qBzaCBS/X+mzw0gYbz4mlU=; fh=BUqPy5FUCVPkstDib3R5KgOx9HuswG+Qa0ykm+K1Z5w=; b=AfvK3g2xTfxEntjvit1bbfsmLoc9Jk80bvZshR6I37YmEM7dWrjNpfMbUY28JDJ9I6 XcWGhDfIc1fQFo7x6VuUfyPkT6o8tCid4ZyQGfbe82oG1zD8EVGR9cE/LoJ1SeZhLp4r wEz2uD/ChRuwQ8PVRMBhVVnA7JvebH8l5w0+giH6iiBQz/P4IaZQgYD0b907FZnW/9wt jQE0+ioID6PdjqEqpC3xkJZbP3txtmpg5mnP55gxQnx6sWBeMVYi77VX02QkTYv2TGhQ LKdOscpvVm6m4wNvaeB8njVt9D+k4zv7n0ivHB552WGppW3RLJgxZYqYkQDEMoA3TEyQ Bpvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=lvndEkUm; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e15-20020a170903240f00b001a699fc81e8si9772279plo.98.2023.06.28.12.29.15; Wed, 28 Jun 2023 12:29:28 -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=@infradead.org header.s=casper.20170209 header.b=lvndEkUm; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232050AbjF1TEI (ORCPT + 99 others); Wed, 28 Jun 2023 15:04:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231811AbjF1TDm (ORCPT ); Wed, 28 Jun 2023 15:03:42 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EA4FE4 for ; Wed, 28 Jun 2023 12:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=lKbs9JhRzstdbx99oJHX0qBzaCBS/X+mzw0gYbz4mlU=; b=lvndEkUm3fql7Ofj7DbD8bacv9 X4cq4p7Lh0kkTXRji6mISx1LdRN3cFnfgSclqDWM0SJ7xX0mHniZv3NCC7V1FZd6t5fXlPbKZS14J ie7qT2Mg2YbBoGPbwpQltkvIVK2U0Ma4RIAGUltXjDf9p/1AEx4a3vnnFYKkkY6qHsjEXPXAJkQaM ne5Z0majlk03LAuZbndjx5Xi7SJBROABp/OkdXIWL1zULfiXYPPxv1lI9WfN1FRt3EouN3ywSkp37 MxDWoQhwlewNYYdk7ksOORrhjiqziaKEt9K1i7uFMtp//V+5p6hUois1DN39gAl7MHsR/72kc9rhP 4OaXVeGg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qEaS2-0047pF-7x; Wed, 28 Jun 2023 19:03:38 +0000 Date: Wed, 28 Jun 2023 20:03:38 +0100 From: Matthew Wilcox To: Linus Torvalds , Thomas Gleixner Cc: linux-kernel@vger.kernel.org Subject: Reunbreak the MEM_ENCRYPT build Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,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?1769975912502053969?= X-GMAIL-MSGID: =?utf-8?q?1769975912502053969?= Current top of tree doesn't build for me: ../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); | ^~~~~~~~~~~~~~~~ I applied this locally: Probably this is the wrong fix. 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);