Index: linux-2.6/arch/x86_64/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86_64/Kconfig	2007-02-09 12:20:46.000000000 -0800
+++ linux-2.6/arch/x86_64/Kconfig	2007-02-09 12:24:17.000000000 -0800
@@ -344,7 +344,7 @@ config K8_NUMA
 
 config NODES_SHIFT
 	int
-	default "6"
+	default "9"
 	depends on NEED_MULTIPLE_NODES
 
 # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
@@ -403,10 +403,10 @@ config OUT_OF_LINE_PFN_TO_PAGE
 	depends on DISCONTIGMEM
 
 config NR_CPUS
-	int "Maximum number of CPUs (2-256)"
-	range 2 255
+	int "Maximum number of CPUs (2-16384)"
+	range 2 16384
 	depends on SMP
-	default "8"
+	default "2048"
 	help
 	  This allows you to specify the maximum number of CPUs which this
 	  kernel will support. Current maximum is 256 CPUs due to