Commit c9e0d391 authored by Dave Jones's avatar Dave Jones Committed by Ingo Molnar

x86/mm/pat: Make split_page_count() check for empty levels to fix /proc/meminfo output

In CONFIG_PAGEALLOC_DEBUG=y builds, we disable 2M pages.

Unfortunatly when we split up mappings during boot,
split_page_count() doesn't take this into account, and
starts decrementing an empty direct_pages_count[] level.

This results in /proc/meminfo showing crazy things like:

  DirectMap2M:    18446744073709543424 kB
Signed-off-by: default avatarDave Jones <davej@codemonkey.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c0c57019
...@@ -66,6 +66,9 @@ void update_page_count(int level, unsigned long pages) ...@@ -66,6 +66,9 @@ void update_page_count(int level, unsigned long pages)
static void split_page_count(int level) static void split_page_count(int level)
{ {
if (direct_pages_count[level] == 0)
return;
direct_pages_count[level]--; direct_pages_count[level]--;
direct_pages_count[level - 1] += PTRS_PER_PTE; direct_pages_count[level - 1] += PTRS_PER_PTE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment