2021-05-29 10:47:44

by Kefeng Wang

Subject: [PATCH 07/15] m68k: convert to setup_initial_init_mm()

Use setup_initial_init_mm() helper to simplify code.

Cc: Geert Uytterhoeven <[email protected]>
Cc: [email protected]
Signed-off-by: Kefeng Wang <[email protected]>
---
arch/m68k/kernel/setup_mm.c | 5 +----
arch/m68k/kernel/setup_no.c | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 017bac3aab80..4b51bfd38e5f 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -258,10 +258,7 @@ void __init setup_arch(char **cmdline_p)
}
}

- init_mm.start_code = PAGE_OFFSET;
- init_mm.end_code = (unsigned long)_etext;
- init_mm.end_data = (unsigned long)_edata;
- init_mm.brk = (unsigned long)_end;
+ setup_initial_init_mm((void *)PAGE_OFFSET, _etext, _edata, _end);

#if defined(CONFIG_BOOTPARAM)
strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index d1b7988efc91..541b134ed8fc 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -87,10 +87,7 @@ void __init setup_arch(char **cmdline_p)
memory_start = PAGE_ALIGN(_ramstart);
memory_end = _ramend;

- init_mm.start_code = (unsigned long) &_stext;
- init_mm.end_code = (unsigned long) &_etext;
- init_mm.end_data = (unsigned long) &_edata;
- init_mm.brk = (unsigned long) 0;
+ setup_initial_init_mm(_stext, _etext, _edata, (void *)0);

config_BSP(&command_line[0], sizeof(command_line));

--
2.26.2

2021-05-31 07:49:48

by Geert Uytterhoeven

Subject: Re: [PATCH 07/15] m68k: convert to setup_initial_init_mm()

Hi Kefeng

(CC Greg for m68knommu)

On Sat, May 29, 2021 at 12:46 PM Kefeng Wang <[email protected]> wrote:
> Use setup_initial_init_mm() helper to simplify code.
>
> Cc: Geert Uytterhoeven <[email protected]>
> Cc: [email protected]
> Signed-off-by: Kefeng Wang <[email protected]>

Thanks for your patch!

> --- a/arch/m68k/kernel/setup_mm.c
> +++ b/arch/m68k/kernel/setup_mm.c
> @@ -258,10 +258,7 @@ void __init setup_arch(char **cmdline_p)
> }
> }
>
> - init_mm.start_code = PAGE_OFFSET;
> - init_mm.end_code = (unsigned long)_etext;
> - init_mm.end_data = (unsigned long)_edata;
> - init_mm.brk = (unsigned long)_end;
> + setup_initial_init_mm((void *)PAGE_OFFSET, _etext, _edata, _end);

Acked-by: Geert Uytterhoeven <[email protected]>

> --- a/arch/m68k/kernel/setup_no.c
> +++ b/arch/m68k/kernel/setup_no.c
> @@ -87,10 +87,7 @@ void __init setup_arch(char **cmdline_p)
> memory_start = PAGE_ALIGN(_ramstart);
> memory_end = _ramend;
>
> - init_mm.start_code = (unsigned long) &_stext;
> - init_mm.end_code = (unsigned long) &_etext;
> - init_mm.end_data = (unsigned long) &_edata;
> - init_mm.brk = (unsigned long) 0;
> + setup_initial_init_mm(_stext, _etext, _edata, (void *)0);

Please use NULL instead of (void *)0.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2021-06-02 13:20:16

by Greg Ungerer

Subject: Re: [PATCH 07/15] m68k: convert to setup_initial_init_mm()

On 31/5/21 5:48 pm, Geert Uytterhoeven wrote:
> Hi Kefeng
>
> (CC Greg for m68knommu)
>
> On Sat, May 29, 2021 at 12:46 PM Kefeng Wang <[email protected]> wrote:
>> Use setup_initial_init_mm() helper to simplify code.
>>
>> Cc: Geert Uytterhoeven <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Kefeng Wang <[email protected]>
>
> Thanks for your patch!
>
>> --- a/arch/m68k/kernel/setup_mm.c
>> +++ b/arch/m68k/kernel/setup_mm.c
>> @@ -258,10 +258,7 @@ void __init setup_arch(char **cmdline_p)
>> }
>> }
>>
>> - init_mm.start_code = PAGE_OFFSET;
>> - init_mm.end_code = (unsigned long)_etext;
>> - init_mm.end_data = (unsigned long)_edata;
>> - init_mm.brk = (unsigned long)_end;
>> + setup_initial_init_mm((void *)PAGE_OFFSET, _etext, _edata, _end);
>
> Acked-by: Geert Uytterhoeven <[email protected]>
>
>> --- a/arch/m68k/kernel/setup_no.c
>> +++ b/arch/m68k/kernel/setup_no.c
>> @@ -87,10 +87,7 @@ void __init setup_arch(char **cmdline_p)
>> memory_start = PAGE_ALIGN(_ramstart);
>> memory_end = _ramend;
>>
>> - init_mm.start_code = (unsigned long) &_stext;
>> - init_mm.end_code = (unsigned long) &_etext;
>> - init_mm.end_data = (unsigned long) &_edata;
>> - init_mm.brk = (unsigned long) 0;
>> + setup_initial_init_mm(_stext, _etext, _edata, (void *)0);
>
> Please use NULL instead of (void *)0.

With that in place, no problems I see.

Acked-by: Greg Ungerer <[email protected]>


> Gr{oetje,eeting}s,
>
> Geert
>