[PATCH] sh: fix build error in mm/init.c

[PATCH] sh: fix build error in mm/init.c

[Masahiro Yamada]

The closing parenthesis is missing.

Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/sh/mm/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index b9de2d4fa57e..8d2a68aea1fc 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -412,7 +412,7 @@ int arch_add_memory(int nid, u64 start, u64 size,
 	unsigned long nr_pages = size >> PAGE_SHIFT;
 	int ret;
 
-	if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)
+	if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot))
 		return -EINVAL;
 
 	/* We only have ZONE_NORMAL, so this is easy.. */
-- 
2.25.1

Re: [PATCH] sh: fix build error in mm/init.c

[Geert Uytterhoeven]

On Mon, Apr 13, 2020 at 7:44 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
> The closing parenthesis is missing.
>
> Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

> --- a/arch/sh/mm/init.c
> +++ b/arch/sh/mm/init.c
> @@ -412,7 +412,7 @@ int arch_add_memory(int nid, u64 start, u64 size,
>         unsigned long nr_pages = size >> PAGE_SHIFT;
>         int ret;
>
> -       if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)
> +       if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot))
>                 return -EINVAL;
>
>         /* We only have ZONE_NORMAL, so this is easy.. */

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

Re: [PATCH] sh: fix build error in mm/init.c

[Logan Gunthorpe]

On 2020-04-12 7:47 p.m., Masahiro Yamada wrote:
> The closing parenthesis is missing.
> 
> Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Oh, oops, I thought I compile checked all the arches. Must have been a
last minute change. I'm also surprised the kbuild robot didn't catch this.

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

Andrew, can this be squashed into the existing patch?

Thanks,

Logan

Re: [PATCH] sh: fix build error in mm/init.c

[Masahiro Yamada]

On Tue, Apr 14, 2020 at 12:43 AM Logan Gunthorpe <logang@deltatee.com> wrote:
>
>
>
> On 2020-04-12 7:47 p.m., Masahiro Yamada wrote:
> > The closing parenthesis is missing.
> >
> > Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > ---
>
> Oh, oops, I thought I compile checked all the arches. Must have been a
> last minute change. I'm also surprised the kbuild robot didn't catch this.
>
> Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
>
> Andrew, can this be squashed into the existing patch?


The offending commit is already in Linus' tree.

I was also surprised that no bot or human
complained about this breakage before it was merged.



-- 
Best Regards
Masahiro Yamada

Re: [PATCH] sh: fix build error in mm/init.c

[Masahiro Yamada]

Hi Linus,

On Mon, Apr 13, 2020 at 10:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The closing parenthesis is missing.
>
> Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>



Will you pick up this directly ?
The SuperH subsystem is inactive these days.

https://lore.kernel.org/patchwork/patch/1223032/


This is easy to review, and ARCH=sh build is apparently broken.

Thanks.





> ---
>
>  arch/sh/mm/init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
> index b9de2d4fa57e..8d2a68aea1fc 100644
> --- a/arch/sh/mm/init.c
> +++ b/arch/sh/mm/init.c
> @@ -412,7 +412,7 @@ int arch_add_memory(int nid, u64 start, u64 size,
>         unsigned long nr_pages = size >> PAGE_SHIFT;
>         int ret;
>
> -       if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)
> +       if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot))
>                 return -EINVAL;
>
>         /* We only have ZONE_NORMAL, so this is easy.. */
> --
> 2.25.1
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] sh: fix build error in mm/init.c

[Masahiro Yamada]

On Mon, Apr 20, 2020 at 5:46 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Hi Linus,
>
> On Mon, Apr 13, 2020 at 10:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
> >
> > The closing parenthesis is missing.
> >
> > Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>
>
>
> Will you pick up this directly ?
> The SuperH subsystem is inactive these days.
>
> https://lore.kernel.org/patchwork/patch/1223032/
>
>
> This is easy to review, and ARCH=sh build is apparently broken.
>
> Thanks.


Sorry, I take it back.

Guenter's one is already queued up in linux-next.

Somebody will fix it eventually.




-- 
Best Regards
Masahiro Yamada