| Message ID | 20230214005400.17137-1-rdunlap@infradead.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
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 <rfc822;tebrre53rla2o@gmail.com>
+ 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
<rfc822;linux-kernel@vger.kernel.org>);
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 <rdunlap@infradead.org>
To: linux-kernel@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>, Song Liu <song@kernel.org>,
Luis Chamberlain <mcgrof@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
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
Content-Transfer-Encoding: 8bit
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: <linux-kernel.vger.kernel.org>
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?=
|
| Series |
module: fix MIPS module_layout -> module_memory
|
|
Commit Message
Randy Dunlap
Feb. 14, 2023, 12:54 a.m. UTC
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 <rdunlap@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org
---
Has this already been fixed?
arch/mips/kernel/vpe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Hi Randy, On 14/2/23 01:54, Randy Dunlap wrote: > 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") On which tree is your patch based? fatal: ambiguous argument '2ece476a2346': unknown revision or path not in the working tree. > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Song Liu <song@kernel.org> > Cc: Luis Chamberlain <mcgrof@kernel.org> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > 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; >
On 2/13/23 23:22, Philippe Mathieu-Daudé wrote: > Hi Randy, > > On 14/2/23 01:54, Randy Dunlap wrote: >> 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") > > On which tree is your patch based? linux-next-20230213. > fatal: ambiguous argument '2ece476a2346': unknown revision or path not in the working tree. > >> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> >> Cc: Song Liu <song@kernel.org> >> Cc: Luis Chamberlain <mcgrof@kernel.org> >> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> >> 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; >> >
On Tue, Feb 14, 2023 at 08:52:04AM -0800, Randy Dunlap wrote: > > > On 2/13/23 23:22, Philippe Mathieu-Daudé wrote: > > Hi Randy, > > > > On 14/2/23 01:54, Randy Dunlap wrote: > >> 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") > > > > On which tree is your patch based? > > linux-next-20230213. so I can't apply, because this is not in mips-next tree. It should be applied to the tree, where this commit is coming from. Thomas.
On 17/2/23 12:58, Thomas Bogendoerfer wrote: > On Tue, Feb 14, 2023 at 08:52:04AM -0800, Randy Dunlap wrote: >> >> >> On 2/13/23 23:22, Philippe Mathieu-Daudé wrote: >>> Hi Randy, >>> >>> On 14/2/23 01:54, Randy Dunlap wrote: >>>> 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") >>> >>> On which tree is your patch based? >> >> linux-next-20230213. > > so I can't apply, because this is not in mips-next tree. It should be > applied to the tree, where this commit is coming from. Or squashed...
On 2/17/23 04:35, Philippe Mathieu-Daudé wrote: > On 17/2/23 12:58, Thomas Bogendoerfer wrote: >> On Tue, Feb 14, 2023 at 08:52:04AM -0800, Randy Dunlap wrote: >>> >>> >>> On 2/13/23 23:22, Philippe Mathieu-Daudé wrote: >>>> Hi Randy, >>>> >>>> On 14/2/23 01:54, Randy Dunlap wrote: >>>>> 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") >>>> >>>> On which tree is your patch based? >>> >>> linux-next-20230213. >> >> so I can't apply, because this is not in mips-next tree. It should be >> applied to the tree, where this commit is coming from. > > Or squashed... > Sure, either one of those. I copied Song and Luis on the patch and it begins with "module:". @Song !?? @Luis !?? thanks.
On Fri, Feb 17, 2023 at 07:53:17AM -0800, Randy Dunlap wrote: > > > On 2/17/23 04:35, Philippe Mathieu-Daudé wrote: > > On 17/2/23 12:58, Thomas Bogendoerfer wrote: > >> On Tue, Feb 14, 2023 at 08:52:04AM -0800, Randy Dunlap wrote: > >>> > >>> > >>> On 2/13/23 23:22, Philippe Mathieu-Daudé wrote: > >>>> Hi Randy, > >>>> > >>>> On 14/2/23 01:54, Randy Dunlap wrote: > >>>>> 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") > >>>> > >>>> On which tree is your patch based? > >>> > >>> linux-next-20230213. > >> > >> so I can't apply, because this is not in mips-next tree. It should be > >> applied to the tree, where this commit is coming from. > > > > Or squashed... > > > > Sure, either one of those. I copied Song and Luis on the patch > and it begins with "module:". > > @Song !?? > @Luis !?? Thanks! I've queued this up onto modules-next. That patch which changes the layout won't go in on this merge window so it will all sit and bake for a good long while before it gets upstream. Luis
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;