Skip to contentSkip to conversation

sh: fix build error in mm/init.c

PATCH Applied Masahiro Yamada 3 participants 6 messages Apr 13, 2020 – Apr 19, 2020 SuperH

lore
Share & tools
lore
#0 lore raw

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

The closing parenthesis is missing.

Fixes bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")

---

 arch/sh/mm/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/mm/init.c +1 -1
index b9de2d4fa57e..8d2a68aea1fc 100644
@@ -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.. */
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Masahiro Yamada

The closing parenthesis is missing.

Fixes bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")

arch/sh/mm/init.c int arch_add_memory(int nid, u64 start, u64 size, · line 418

Quoted 11 lines
arch/sh/mm/init.c +1 -1
@@ -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

Signature · 5 lines
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
Reviewed-by on v1 1/1
#2 lore raw
In reply to Masahiro Yamada
Quoted 5 lines · Masahiro Yamada

The closing parenthesis is missing.

Fixes bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")

---

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.

Andrew, can this be squashed into the existing patch?

Thanks,

Logan

#3 lore raw
Quoted 10 lines · Logan Gunthorpe
Quoted 5 lines · Masahiro Yamada

The closing parenthesis is missing.

Fixes bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")

---

Quoted 6 lines

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.

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.

Signature · 2 lines
Best Regards
Masahiro Yamada
#4 lore raw
In reply to Masahiro Yamada

Hi Linus,

Quoted 5 lines · Masahiro Yamada

The closing parenthesis is missing.

Fixes bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")

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.

Quoted 21 lines

---

 arch/sh/mm/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/mm/init.c +1 -2
index b9de2d4fa57e..8d2a68aea1fc 100644
@@ -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

Signature · 2 lines
Best Regards
Masahiro Yamada
#5 lore raw
Quoted 15 lines · Masahiro Yamada

Hi Linus,

Quoted 5 lines · Masahiro Yamada

The closing parenthesis is missing.

Fixes bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")

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

Quoted 6 lines

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.

Signature · 2 lines
Best Regards
Masahiro Yamada