From patchwork Tue Feb 14 00:54:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 56601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2676335wrn; Mon, 13 Feb 2023 16:59:56 -0800 (PST) X-Google-Smtp-Source: AK7set9aXM4eEZmnW1RjYJeMzLJ7F/4GMk1i+q4RX/DKLOucpDGKWBsFOihTA2XFvvQzZFcrasZc X-Received: by 2002:a17:90a:1d5:b0:22c:8161:5143 with SMTP id 21-20020a17090a01d500b0022c81615143mr429995pjd.31.1676336395883; Mon, 13 Feb 2023 16:59:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676336395; cv=none; d=google.com; s=arc-20160816; b=bUjS093S4l9IcgyWzU7jDyk0y3gqHn2bI3D3sHBtCsxRyfw3Q01ignelesQCxD4EsD VeW75oSZ5m2qkQ4TMn7JPgf3v/RNUF4YH5FFP6aN3dPjRqMzD0u1VOi3J1hp6TgPLyEj 7eIB84N1m1cQCHpTOlmQQDaoSuoQlObH4ir8ykjMoe0RGEFALcJKmPDkfSGWoI1BV13a Yeg6oKRHdastYOkUya4jsocfjZNt4rJU3VKvGJaAoFFNUchSlJ4ErHhYs6GloA6nkz/Z RhreBpszkU8/8gVN5zkfPv1arU/mFgnmxu3VXovyMNe9wPqSkMuEtX7YNmbUtTt0dhGV Q3gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=maH2SZy98/KPk5SI0WVIPKnJ0GBrmU/W71CMItL8ib8=; b=ev/41pzX4yHbCVT2cKOrrtCsrMXtLQy+MVtVSxzPGDGEJ4ZdCKjuM91WBuY7NmAosB eQ37Nda5WcrKnDjIdTG6Te0g97xOIptZQFxKspac1HB3urMM1ghMsT1pMBgYr1y9xmzl ekLXvWG6DjLFBDBHwnItjhfwfabi5kxwKGXXnE3H2ffgWdEKTkJPafk9LSx0MTdgAKV3 G0jrAs4BWOjEYknLjhgcXaYO2qPncHG5Vkj2RquHi9Fyy/8kZU/Qy7ZpCgPTUFCleWjl dCps3JmBn/5l0vTo3aPxqFB4YJZdRNPAO15IjBmjogjrmolxkHBv5g8nMa0EJJxHx6fJ Mr7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=U05NZKDI; 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 m64-20020a633f43000000b004facc8ab172si5827151pga.846.2023.02.13.16.59.42; Mon, 13 Feb 2023 16:59:55 -0800 (PST) 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=bombadil.20210309 header.b=U05NZKDI; 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 S229798AbjBNAyH (ORCPT + 99 others); Mon, 13 Feb 2023 19:54:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbjBNAyF (ORCPT ); Mon, 13 Feb 2023 19:54:05 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E1B3105; Mon, 13 Feb 2023 16:54:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=maH2SZy98/KPk5SI0WVIPKnJ0GBrmU/W71CMItL8ib8=; b=U05NZKDIp4T6btFRFUQTHY/uOV swOuky79Glp29Yi1jzXUjH8YvkxuxZ/u9EqDYiqUCX7SZBUPiE/alTvIt4VB4FEaIPBcLOn742fcK 6mC7Xx+WWKug2znulWwdEDg158RNYjlTtLUyKQK12F2tBaKt8pNdMtJeQVnY6d8RU6v7+4Nw2267H KBfZKFB1kY4F2v4+VkhTA+g5t/G3Co6sRzNgasrZ7+hrydpA/j4wlkOydRKOYxZLvw7XTvpP6F8zV Yh9YGM/KUQUmvh4LjSBfPr8MLgwYyHLWPUHQw+0UAlPHjJxMzBvwAgyrCY+JPmU8ndkkzLeDbqyfk YWZ/PRmg==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRja5-00GwhC-Db; Tue, 14 Feb 2023 00:54:01 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Song Liu , Luis Chamberlain , Thomas Bogendoerfer , linux-mips@vger.kernel.org Subject: [PATCH] module: fix MIPS module_layout -> module_memory Date: Mon, 13 Feb 2023 16:54:00 -0800 Message-Id: <20230214005400.17137-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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 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?1757766112666811659?= X-GMAIL-MSGID: =?utf-8?q?1757766112666811659?= Correct the struct's field/member name from mod_mem to mem. Fixes this build error: ../arch/mips/kernel/vpe.c: In function 'vpe_elfload': ../arch/mips/kernel/vpe.c:643:41: error: 'struct module' has no member named 'mod_mem' 643 | v->load_addr = alloc_progmem(mod.mod_mem[MOD_TEXT].size); Fixes: 2ece476a2346 ("module: replace module_layout with module_memory") Signed-off-by: Randy Dunlap Cc: Song Liu Cc: Luis Chamberlain Cc: Thomas Bogendoerfer Cc: linux-mips@vger.kernel.org --- Has this already been fixed? arch/mips/kernel/vpe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -- a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -640,7 +640,7 @@ static int vpe_elfload(struct vpe *v) layout_sections(&mod, hdr, sechdrs, secstrings); } - v->load_addr = alloc_progmem(mod.mod_mem[MOD_TEXT].size); + v->load_addr = alloc_progmem(mod.mem[MOD_TEXT].size); if (!v->load_addr) return -ENOMEM;