[IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEM
authorBob Picco <bob.picco@hp.com>
Wed, 28 Jun 2006 16:55:43 +0000 (12:55 -0400)
committerTony Luck <tony.luck@intel.com>
Thu, 3 Aug 2006 17:13:23 +0000 (10:13 -0700)
commite44e41d0c832ebbda7311a1fe43584d844026357
tree05a8ac85029b041db8defef35bf808d431bb3528
parent921eea1cdf6ce7f0db88e4579474a04b1fb0fe6d
[IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEM

contig.c (FLATMEM) requires the same optimization as in discontig.c for show_mem
when VIRTUAL_MEM_MAP is in use. Otherwise FLATMEM has softlockup timeouts.
This was boot tested for memory configuration: SPARSEMEM,
DISCONTIG+VIRTUAL_MEM_MAP, FLATMEM, FLATMEM+VIRTUAL_MEM_MAP and
FLATMEM+VIRTUAL_MEM_MAP with largest memory gap less than LARGE_GAP by
using boot parameter "mem=".

This was boot tested and "echo m >/proc/sysrq-trigger" output evaluated for
: FLATMEM, FLATMEM+VIRTUAL_MEM_MAP, DISCONTIGMEM+VIRTUAL_MEM_MAP and
SPARSEMEM.

Signed-off-by: Bob Picco <bob.picco@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/mm/contig.c
arch/ia64/mm/discontig.c
arch/ia64/mm/init.c
include/asm-ia64/meminit.h