[PATCH] reorganize x86-64 NUMA and DISCONTIGMEM config options