From a716bb73d942dc79a0b26c6151994f57e1ac8ae8 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Mon, 13 Feb 2012 08:47:49 -0600 Subject: [PATCH] --- yaml --- r: 289082 b: refs/heads/master c: 0cbb613fa82fb09b6ef914ab0aaa92091f367bb6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/zcache/Kconfig | 4 +++- trunk/drivers/staging/zram/Kconfig | 4 +++- trunk/drivers/staging/zsmalloc/Kconfig | 5 ++++- trunk/drivers/staging/zsmalloc/zsmalloc-main.c | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b819f4385120..ab476c0896c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b91867f2ee5c84b550f95ce54c91b180f70f48cb +refs/heads/master: 0cbb613fa82fb09b6ef914ab0aaa92091f367bb6 diff --git a/trunk/drivers/staging/zcache/Kconfig b/trunk/drivers/staging/zcache/Kconfig index 94e48aa9f36b..5a36fcfd87c0 100644 --- a/trunk/drivers/staging/zcache/Kconfig +++ b/trunk/drivers/staging/zcache/Kconfig @@ -1,6 +1,8 @@ config ZCACHE tristate "Dynamic compression of swap pages and clean pagecache pages" - depends on (CLEANCACHE || FRONTSWAP) && CRYPTO + # X86 dependency is because zsmalloc uses non-portable pte/tlb + # functions + depends on (CLEANCACHE || FRONTSWAP) && CRYPTO && X86 select ZSMALLOC select CRYPTO_LZO default n diff --git a/trunk/drivers/staging/zram/Kconfig b/trunk/drivers/staging/zram/Kconfig index ee23a86ea7d5..9d11a4cb99b7 100644 --- a/trunk/drivers/staging/zram/Kconfig +++ b/trunk/drivers/staging/zram/Kconfig @@ -1,6 +1,8 @@ config ZRAM tristate "Compressed RAM block device support" - depends on BLOCK && SYSFS + # X86 dependency is because zsmalloc uses non-portable pte/tlb + # functions + depends on BLOCK && SYSFS && X86 select ZSMALLOC select LZO_COMPRESS select LZO_DECOMPRESS diff --git a/trunk/drivers/staging/zsmalloc/Kconfig b/trunk/drivers/staging/zsmalloc/Kconfig index 3e7a8d4d2172..8e2c6a05a178 100644 --- a/trunk/drivers/staging/zsmalloc/Kconfig +++ b/trunk/drivers/staging/zsmalloc/Kconfig @@ -1,6 +1,9 @@ config ZSMALLOC tristate "Memory allocator for compressed pages" - depends on SPARSEMEM + # X86 dependency is because of the use of __flush_tlb_one and set_pte + # in zsmalloc-main.c. + # TODO: convert these to portable functions + depends on SPARSEMEM && X86 default n help zsmalloc is a slab-based memory allocator designed to store diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c index 189fb42313bb..455fc2f97246 100644 --- a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "zsmalloc.h" #include "zsmalloc_int.h"