summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-10-04 15:48:10 +0200
committerIngo Molnar <mingo@kernel.org>2012-10-24 10:50:25 +0200
commit876ee61aadf01aa0db981b5d249cbdd53dc28b5e (patch)
tree3acb8c5c40f379a27d4fe26dd13f317715fbe73d /arch/x86/include/asm
parentRevert "x86/mm: Fix the size calculation of mapping tables" (diff)
downloadlinux-876ee61aadf01aa0db981b5d249cbdd53dc28b5e.tar.xz
linux-876ee61aadf01aa0db981b5d249cbdd53dc28b5e.zip
x86-64: Fix page table accounting
Commit 20167d3421a089a1bf1bd680b150dc69c9506810 ("x86-64: Fix accounting in kernel_physical_mapping_init()") went a little too far by entirely removing the counting of pre-populated page tables: this should be done at boot time (to cover the page tables set up in early boot code), but shouldn't be done during memory hot add. Hence, re-add the removed increments of "pages", but make them and the one in phys_pte_init() conditional upon !after_bootmem. Reported-Acked-and-Tested-by: Hugh Dickins <hughd@google.com> Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: <stable@kernel.org> Link: http://lkml.kernel.org/r/506DAFBA020000780009FA8C@nat28.tlf.novell.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
0 files changed, 0 insertions, 0 deletions