public inbox for linux-arch@vger.kernel.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Greg Ungerer <gerg@uclinux.org>, Sam Creasey <sammy@sammy.net>,
	linux-m68k@lists.linux-m68k.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
	Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 3/4] m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn
Date: Sun, 15 Nov 2015 12:04:14 +0100	[thread overview]
Message-ID: <1447585455-19671-4-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1447585455-19671-1-git-send-email-geert@linux-m68k.org>

If max_pfn is not initialized, the various /proc/kpage* files are empty,
and selftests/vm/mlock2-tests will fail. max_pfn is also used by the
block layer to calculate DMA masks.

Switch from init_bootmem_node() to init_bootmem(), as there's only one
memory node on Sun-3. This will initialize min_low_pfn and max_low_pfn,
which was also not done before.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Compile-tested only.
---
 arch/m68k/sun3/config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index a8b942bf71638c97..2a5f43a68ae3d73d 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -118,13 +118,13 @@ static void __init sun3_bootmem_alloc(unsigned long memory_start,
 	memory_end = memory_end & PAGE_MASK;
 
 	start_page = __pa(memory_start) >> PAGE_SHIFT;
-	num_pages = __pa(memory_end) >> PAGE_SHIFT;
+	max_pfn = num_pages = __pa(memory_end) >> PAGE_SHIFT;
 
 	high_memory = (void *)memory_end;
 	availmem = memory_start;
 
 	m68k_setup_node(0);
-	availmem += init_bootmem_node(NODE_DATA(0), start_page, 0, num_pages);
+	availmem += init_bootmem(start_page, num_pages);
 	availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK;
 
 	free_bootmem(__pa(availmem), memory_end - (availmem));
-- 
1.9.1

  parent reply	other threads:[~2015-11-15 11:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-15 11:04 [PATCH 0/4] m68k/mm: Add missing initialization of max_pfn and {min,max}_low_pfn Geert Uytterhoeven
2015-11-15 11:04 ` Geert Uytterhoeven
2015-11-15 11:04 ` [PATCH 1/4] m68k/mm: motorola - Add missing initialization of max_pfn Geert Uytterhoeven
2015-11-17  4:42   ` Michael Schmitz
2015-11-17 19:54     ` Geert Uytterhoeven
2015-11-17 19:54       ` Geert Uytterhoeven
2015-11-15 11:04 ` [PATCH 2/4] m68k/mm: m54xx " Geert Uytterhoeven
2015-11-15 11:04   ` Geert Uytterhoeven
2015-11-17  0:16   ` Greg Ungerer
2015-11-17  0:16     ` Greg Ungerer
2015-11-15 11:04 ` Geert Uytterhoeven [this message]
2015-11-15 11:04   ` [PATCH 3/4] m68k/mm: sun3 - Add missing initialization of max_pfn and {min,max}_low_pfn Geert Uytterhoeven
2015-11-15 11:04 ` [PATCH 4/4] m68knommu: " Geert Uytterhoeven
2015-11-15 11:04   ` Geert Uytterhoeven
2015-11-16 12:18   ` Greg Ungerer
2015-11-16 12:18     ` Greg Ungerer
2015-11-16 13:05     ` Geert Uytterhoeven
2015-11-16 23:46       ` Greg Ungerer
2015-11-16 23:54   ` Greg Ungerer
2015-11-22 10:38     ` Geert Uytterhoeven
2015-11-17  0:17 ` [PATCH 0/4] m68k/mm: " Greg Ungerer
2015-11-17  0:17   ` Greg Ungerer

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=1447585455-19671-4-git-send-email-geert@linux-m68k.org \
    --to=geert@linux-m68k.org \
    --cc=gerg@uclinux.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=sammy@sammy.net \
    /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