All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] module: fix MIPS module_layout -> module_memory
@ 2023-02-14  0:54 Randy Dunlap
  2023-02-14  7:22 ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2023-02-14  0:54 UTC (permalink / raw)
  To: linux-kernel
  Cc: Randy Dunlap, Song Liu, Luis Chamberlain, Thomas Bogendoerfer,
	linux-mips

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(-)

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;
 

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] module: fix MIPS module_layout -> module_memory
  2023-02-14  0:54 [PATCH] module: fix MIPS module_layout -> module_memory Randy Dunlap
@ 2023-02-14  7:22 ` Philippe Mathieu-Daudé
  2023-02-14 16:52   ` Randy Dunlap
  0 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-14  7:22 UTC (permalink / raw)
  To: Randy Dunlap, linux-kernel
  Cc: Song Liu, Luis Chamberlain, Thomas Bogendoerfer, linux-mips

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;
>   


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] module: fix MIPS module_layout -> module_memory
  2023-02-14  7:22 ` Philippe Mathieu-Daudé
@ 2023-02-14 16:52   ` Randy Dunlap
  2023-02-17 11:58     ` Thomas Bogendoerfer
  0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2023-02-14 16:52 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé, linux-kernel
  Cc: Song Liu, Luis Chamberlain, Thomas Bogendoerfer, linux-mips



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;
>>   
> 

-- 
~Randy

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] module: fix MIPS module_layout -> module_memory
  2023-02-14 16:52   ` Randy Dunlap
@ 2023-02-17 11:58     ` Thomas Bogendoerfer
  2023-02-17 12:35       ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 7+ messages in thread
From: Thomas Bogendoerfer @ 2023-02-17 11:58 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Philippe Mathieu-Daudé,
	linux-kernel, Song Liu, Luis Chamberlain, linux-mips

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 ]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] module: fix MIPS module_layout -> module_memory
  2023-02-17 11:58     ` Thomas Bogendoerfer
@ 2023-02-17 12:35       ` Philippe Mathieu-Daudé
  2023-02-17 15:53         ` Randy Dunlap
  0 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-17 12:35 UTC (permalink / raw)
  To: Thomas Bogendoerfer, Randy Dunlap
  Cc: linux-kernel, Song Liu, Luis Chamberlain, linux-mips

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...


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] module: fix MIPS module_layout -> module_memory
  2023-02-17 12:35       ` Philippe Mathieu-Daudé
@ 2023-02-17 15:53         ` Randy Dunlap
  2023-02-21 21:39           ` Luis Chamberlain
  0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2023-02-17 15:53 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé, Thomas Bogendoerfer
  Cc: linux-kernel, Song Liu, Luis Chamberlain, linux-mips



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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] module: fix MIPS module_layout -> module_memory
  2023-02-17 15:53         ` Randy Dunlap
@ 2023-02-21 21:39           ` Luis Chamberlain
  0 siblings, 0 replies; 7+ messages in thread
From: Luis Chamberlain @ 2023-02-21 21:39 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Philippe Mathieu-Daudé,
	Thomas Bogendoerfer, linux-kernel, Song Liu, linux-mips

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-02-21 21:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-14  0:54 [PATCH] module: fix MIPS module_layout -> module_memory Randy Dunlap
2023-02-14  7:22 ` Philippe Mathieu-Daudé
2023-02-14 16:52   ` Randy Dunlap
2023-02-17 11:58     ` Thomas Bogendoerfer
2023-02-17 12:35       ` Philippe Mathieu-Daudé
2023-02-17 15:53         ` Randy Dunlap
2023-02-21 21:39           ` Luis Chamberlain

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.