public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
From: Mike Rapoport <rppt@linux.ibm.com>
To: Angelo Dureghello <angelo@kernel-space.org>
Cc: gerg@linux-m68k.org, akpm@linux-foundation.org,
	linux-m68k@vger.kernel.org
Subject: Re: [PATCH v2] m68k: fix flatmem memory model setup
Date: Mon, 1 Mar 2021 08:59:09 +0200	[thread overview]
Message-ID: <YDyQvY/PtE+znuBJ@linux.ibm.com> (raw)
In-Reply-To: <20210228190828.392974-1-angelo@kernel-space.org>

On Sun, Feb 28, 2021 at 08:08:28PM +0100, Angelo Dureghello wrote:
> Detected a broken boot on mcf54415, likely introduced from
> 
> commit 4bfc848e0981
> ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")
> 
> Fix ARCH_PFN_OFFSET to be a pfn.
> 
> Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>

Acked-by: Mike Rapoport <rppt@linux.ibm.com>

> ---
> Change for v2:
> - replace PAGE_OFFSET with m68k_memory[0].addr
> ---
>  arch/m68k/include/asm/page_mm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
> index 8cfc92451711..1c683ce57d48 100644
> --- a/arch/m68k/include/asm/page_mm.h
> +++ b/arch/m68k/include/asm/page_mm.h
> @@ -167,7 +167,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
>  	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
>  })
>  #else
> -#define ARCH_PFN_OFFSET (m68k_memory[0].addr)
> +#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT)
>  #include <asm-generic/memory_model.h>
>  #endif
>  
> -- 
> 2.30.1
> 

-- 
Sincerely yours,
Mike.

  reply	other threads:[~2021-03-01  7:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-28 19:08 [PATCH v2] m68k: fix flatmem memory model setup Angelo Dureghello
2021-03-01  6:59 ` Mike Rapoport [this message]
2021-03-01 23:26 ` Greg Ungerer
2021-04-12  9:51 ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YDyQvY/PtE+znuBJ@linux.ibm.com \
    --to=rppt@linux.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=angelo@kernel-space.org \
    --cc=gerg@linux-m68k.org \
    --cc=linux-m68k@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox