Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2013-09-12 16:55:16 -0400
committerJeff Mahoney <jeffm@suse.com>2013-09-12 16:56:56 -0400
commit1441e592ea973780e0203a5cac1bf5f0104be532 (patch)
treedb4986e6306c1ea4c5788dae7f0a9c3b26b9da4d
parentfd0a17821467765e148d55578975e2e22e25d3a4 (diff)
config: Enable CONFIG_ZSWAP (bnc#839064).
It's built-in but a no-op without zswap.enabled=1 on the kernel command line.
-rw-r--r--config/i386/debug4
-rw-r--r--config/i386/default4
-rw-r--r--config/i386/desktop4
-rw-r--r--config/i386/ec28
-rw-r--r--config/i386/pae4
-rw-r--r--config/i386/trace4
-rw-r--r--config/i386/vanilla4
-rw-r--r--config/i386/xen4
-rw-r--r--config/x86_64/debug4
-rw-r--r--config/x86_64/default4
-rw-r--r--config/x86_64/desktop4
-rw-r--r--config/x86_64/ec28
-rw-r--r--config/x86_64/trace4
-rw-r--r--config/x86_64/vanilla6
-rw-r--r--config/x86_64/xen4
15 files changed, 35 insertions, 35 deletions
diff --git a/config/i386/debug b/config/i386/debug
index 6a6c8951ed..d5770aed57 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -488,8 +488,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_HIGHPTE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config/i386/default b/config/i386/default
index 5bf18d35ed..adf2daa2a1 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -475,8 +475,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_HIGHPTE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config/i386/desktop b/config/i386/desktop
index c2f9cc3c3d..a816784cc9 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -492,8 +492,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_HIGHPTE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config/i386/ec2 b/config/i386/ec2
index f94486a56b..20f99655c4 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -375,8 +375,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_ARCH_RANDOM=y
CONFIG_SECCOMP=y
@@ -2186,7 +2186,7 @@ CONFIG_CRYPTO_TWOFISH_586=m
#
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
@@ -2236,7 +2236,7 @@ CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
CONFIG_LZ4HC_COMPRESS=m
diff --git a/config/i386/pae b/config/i386/pae
index 99fe704cd8..2fb76914a5 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -493,8 +493,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_HIGHPTE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config/i386/trace b/config/i386/trace
index b09f4ec269..1fa034b2c2 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -494,8 +494,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_HIGHPTE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index fc29ee05f4..4e8174bfce 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -474,8 +474,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_HIGHPTE=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
diff --git a/config/i386/xen b/config/i386/xen
index 53028424aa..818198b9d4 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -409,8 +409,8 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_MTRR=y
CONFIG_X86_PAT=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 0c559a10d0..07f42c8a32 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -467,8 +467,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
diff --git a/config/x86_64/default b/config/x86_64/default
index 45f06d049e..e8a9f2e610 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -472,8 +472,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 9af6226d9e..295e63a1df 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -471,8 +471,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index 5824c22537..62dd52619f 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -363,8 +363,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_ARCH_RANDOM=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -2190,7 +2190,7 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
#
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_LZ4=m
CONFIG_CRYPTO_LZ4HC=m
@@ -2239,7 +2239,7 @@ CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
CONFIG_LZ4HC_COMPRESS=m
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 261ed3ee7b..171a664a78 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -473,8 +473,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 4db193e070..6e59fd1f9f 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -471,8 +471,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -5505,7 +5505,7 @@ CONFIG_XFS_RT=y
# CONFIG_XFS_WARN is not set
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_GFS2_FS_LOCKING_DLM=y
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 80f57e109a..fb77860f9f 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -399,8 +399,8 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
-# CONFIG_ZBUD is not set
-# CONFIG_ZSWAP is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
CONFIG_MTRR=y
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y