Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2010-10-26 13:41:23 +0200
committerJan Beulich <jbeulich@novell.com>2010-10-26 13:41:23 +0200
commitf8e50001889a28feb4610ac171adbc3f16f4bba2 (patch)
tree7dbf521ff1069f710536dab961cccf7ef5318170
parentb772cd8b959ee9b73e64aa8c27efb8ddc037d8ab (diff)
- Update Xen config files (restore options accidentally deleted
-rw-r--r--config/i386/ec23
-rw-r--r--config/i386/xen3
-rw-r--r--config/x86_64/ec23
-rw-r--r--config/x86_64/xen3
-rw-r--r--doc/config-options.changes2
5 files changed, 13 insertions, 1 deletions
diff --git a/config/i386/ec2 b/config/i386/ec2
index 5e7ac75cc2..417b921fcf 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -336,6 +336,9 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TMEM=y
+CONFIG_PRECACHE=y
+CONFIG_PRESWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_SECCOMP=y
# CONFIG_SECCOMP_DISABLE_TSC is not set
diff --git a/config/i386/xen b/config/i386/xen
index 3b4d3f5043..7d5b32388a 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -353,6 +353,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
+CONFIG_TMEM=y
+CONFIG_PRECACHE=y
+CONFIG_PRESWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_MTRR=y
CONFIG_X86_PAT=y
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index 718630bb82..d2113000e1 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -302,6 +302,9 @@ CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TMEM=y
+CONFIG_PRECACHE=y
+CONFIG_PRESWAP=y
CONFIG_SECCOMP=y
# CONFIG_SECCOMP_DISABLE_TSC is not set
# CONFIG_CC_STACKPROTECTOR is not set
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 9e342a4329..6ad31878e7 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -319,6 +319,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
+CONFIG_TMEM=y
+CONFIG_PRECACHE=y
+CONFIG_PRESWAP=y
CONFIG_MTRR=y
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
diff --git a/doc/config-options.changes b/doc/config-options.changes
index b038fafad8..efabf2463b 100644
--- a/doc/config-options.changes
+++ b/doc/config-options.changes
@@ -1,5 +1,5 @@
-------------------------------------------------------------------
-Mon Aug 9 16:28:00 CEST 2010 - jbeulich@novell.com
+Mon Oct 25 12:55:06 CEST 2010 - jbeulich@novell.com
- */xen: X86_MSR=m (to discourage use without considering whether
the intended context is a virtual or a physical CPU)