[PATCH] sh: mm: Fix build error

[PATCH] sh: mm: Fix build error

[Guenter Roeck]

  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 <logang@deltatee.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 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

Re: [PATCH] sh: mm: Fix build error

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1429 bytes --]

Hi Guenter,

On Mon, 13 Apr 2020 09:15:42 -0700 Guenter Roeck <linux@roeck-us.net> 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 <logang@deltatee.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
>  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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] sh: mm: Fix build error

[Logan Gunthorpe]

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/20200413014743.16353-1-masahiroy@kernel.org

Logan