diff options
| author | Christian Limpach <Christian.Limpach@xensource.com> | 2007-01-18 15:18:07 +0000 |
|---|---|---|
| committer | Christian Limpach <Christian.Limpach@xensource.com> | 2007-01-18 15:18:07 +0000 |
| commit | 361f8004cbabe9cdb5386cf2c838b5c732feb53a (patch) | |
| tree | eb750c49a92fb22f728eb6014ea778046309720b /buildconfigs | |
| parent | 10c910a7b561e6df8f8f0118ad61804d8d102973 (diff) | |
| parent | 71c1836f5c613d4a97dad47de25bdf844f3f0e1d (diff) | |
| download | xen-361f8004cbabe9cdb5386cf2c838b5c732feb53a.tar.gz xen-361f8004cbabe9cdb5386cf2c838b5c732feb53a.tar.bz2 xen-361f8004cbabe9cdb5386cf2c838b5c732feb53a.zip | |
[merge] with xen-unstable
Diffstat (limited to 'buildconfigs')
| -rw-r--r-- | buildconfigs/linux-defconfig_xen0_x86_32 | 1 | ||||
| -rw-r--r-- | buildconfigs/linux-defconfig_xenU_x86_32 | 1 | ||||
| -rw-r--r-- | buildconfigs/linux-defconfig_xen_x86_32 | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/buildconfigs/linux-defconfig_xen0_x86_32 b/buildconfigs/linux-defconfig_xen0_x86_32 index 6a999db809..76b2840685 100644 --- a/buildconfigs/linux-defconfig_xen0_x86_32 +++ b/buildconfigs/linux-defconfig_xen0_x86_32 @@ -177,6 +177,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +# CONFIG_HIGHPTE is not set CONFIG_MTRR=y # CONFIG_REGPARM is not set CONFIG_SECCOMP=y diff --git a/buildconfigs/linux-defconfig_xenU_x86_32 b/buildconfigs/linux-defconfig_xenU_x86_32 index 289a73effc..67650c73d5 100644 --- a/buildconfigs/linux-defconfig_xenU_x86_32 +++ b/buildconfigs/linux-defconfig_xenU_x86_32 @@ -174,6 +174,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +# CONFIG_HIGHPTE is not set # CONFIG_REGPARM is not set CONFIG_SECCOMP=y CONFIG_HZ_100=y diff --git a/buildconfigs/linux-defconfig_xen_x86_32 b/buildconfigs/linux-defconfig_xen_x86_32 index 7ac4abd0a2..4928f8d32e 100644 --- a/buildconfigs/linux-defconfig_xen_x86_32 +++ b/buildconfigs/linux-defconfig_xen_x86_32 @@ -182,6 +182,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_RESOURCES_64BIT=y +# CONFIG_HIGHPTE is not set CONFIG_MTRR=y CONFIG_REGPARM=y CONFIG_SECCOMP=y |