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 <[email protected]>
Cc: Song Liu <[email protected]>
Cc: Luis Chamberlain <[email protected]>
Cc: Thomas Bogendoerfer <[email protected]>
Cc: [email protected]
---
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;
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 <[email protected]>
> Cc: Song Liu <[email protected]>
> Cc: Luis Chamberlain <[email protected]>
> Cc: Thomas Bogendoerfer <[email protected]>
> Cc: [email protected]
> ---
> 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 <[email protected]>
>> Cc: Song Liu <[email protected]>
>> Cc: Luis Chamberlain <[email protected]>
>> Cc: Thomas Bogendoerfer <[email protected]>
>> Cc: [email protected]
>> ---
>> 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;
>>
>
--
~Randy
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.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
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.
--
~Randy
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