Hi Guenter,
On Mon, 13 Apr 2020 09:15:42 -0700 Guenter Roeck <[email protected]> wrote:
>
> 415 | if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)
> | ^
> arch/sh/mm/init.c:424:1: error: expected expression before '}' token
> 424 | }
>
> Obviously never even compile tested.
>
> Fixes: a332976e0184 ("mm/memory_hotplug: add pgprot_t to mhp_params")
> Cc: Logan Gunthorpe <[email protected]>
> Cc: Stephen Rothwell <[email protected]>
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> 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.17.1
>
I'll put this in my fixes tree until someone else picks it up. Now
that the patch has reached Linus' tree (and its SHA1 is stable), the
Fixes line should be
Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
--
Cheers,
Stephen Rothwell
On 2020-04-13 4:08 p.m., Stephen Rothwell wrote:
> I'll put this in my fixes tree until someone else picks it up. Now
> that the patch has reached Linus' tree (and its SHA1 is stable), the
> Fixes line should be
>
> Fixes: bfeb022f8fe4 ("mm/memory_hotplug: add pgprot_t to mhp_params")
Masahiroy already sent a fix for this that Andrew has picked up:
http://lkml.kernel.org/r/[email protected]
Logan