Here's another one.  It still has the bootmem allocator change, but I'll
push that seperately on lkml, I think it makes sense.  This version is a
bit different from the last:

  o added back in the #ifndef CONFIG_DISCONTIGMEM in memory.c and mm.h
    for max_mapnr and mem_map
  o added an ugly hack in asm-ia64/page.h to use different vars since
    max_mapnr and mem_map aren't available in the discontig case
  o added back some more CONFIG_VIRTUAL_MEM_MAP #ifdefs

Turning off CONFIG_VIRTUAL_MEM_MAP still doesn't work--need to fix
mm/init.c to accomodate that case.

Any other comments?

Thanks,
Jesse