summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-03-16 09:04:53 -0400
committerKyle McMartin <kyle@redhat.com>2011-03-16 09:05:07 -0400
commit3ddbdca8f8a6a3008b6bc06bbd81250661e604ed (patch)
tree85d118a146570bcaa7783fa4996680ac8add7ff5 /config-x86_64-generic
parent09c361fdb64e5bfc7ec81c9d63aabbc332f65857 (diff)
downloadkernel-3ddbdca8f8a6a3008b6bc06bbd81250661e604ed.tar.gz
kernel-3ddbdca8f8a6a3008b6bc06bbd81250661e604ed.tar.xz
kernel-3ddbdca8f8a6a3008b6bc06bbd81250661e604ed.zip
Set rawhide back on the bleeding edge
Test out scripts/rebase.sh on 2.6.38-git1. Enable fhandle syscalls (ugh. conditional syscalls... update CONFIG_EXPORTFS to =y, since it's now a bool.) CONFIG_XEN_DEBUG [i386,x86_64] =n, but possibly should be -debug conditional. Needs a xen user to benchmark and see how bad the overhead is.
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 0154cf1b0..809daa0ce 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -16,7 +16,7 @@ CONFIG_K8_NUMA=y
CONFIG_AMD_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
# CONFIG_NUMA_EMU is not set
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=512
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_P4_CLOCKMOD=m
CONFIG_IA32_EMULATION=y
@@ -294,6 +294,7 @@ CONFIG_KVM_GUEST=y
CONFIG_KVM_MMU_AUDIT=y
CONFIG_XEN=y
+# CONFIG_XEN_DEBUG is not set
CONFIG_XEN_MAX_DOMAIN_MEMORY=32
CONFIG_XEN_BALLOON=y
CONFIG_XEN_SCRUB_PAGES=y