From patchwork Tue May 8 07:19:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen-chien Jesse Sung X-Patchwork-Id: 157563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 5BED0B6FD0 for ; Tue, 8 May 2012 17:20:16 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SReiM-00008k-DT; Tue, 08 May 2012 07:20:06 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SReiK-00008d-Ks for kernel-team@lists.ubuntu.com; Tue, 08 May 2012 07:20:04 +0000 Received: from [206.15.84.130] (helo=jazz.globalsuite.net) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1SReiK-00050e-0X; Tue, 08 May 2012 07:20:04 +0000 From: Jesse Sung To: kernel-team@lists.ubuntu.com Subject: [Precise][PATCH 2/2] staging: zcache: make zcache builtin only Date: Tue, 8 May 2012 15:19:52 +0800 Message-Id: <2c4a062226322cc51f7111fce9238472130ba9e6.1336456221.git.jesse.sung@canonical.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Cc: 995163@bugs.launchpad.net X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/995163 zcache cannot currently be loaded as a module. However the Kconfig allows it to be built as a module; something that the user probably does not intend since the module is not loadable. This patch switches zcache from a tristate to a bool in the Kconfig Signed-off-by: Seth Jennings Acked-by: Dan Magenheimer Signed-off-by: Greg Kroah-Hartman (backported from commit bec25dfd850cf92cba894c94d6660fc18d3a7447 upstream) Signed-off-by: Jesse Sung --- drivers/staging/zcache/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig index 7fabcb2..391d5f4 100644 --- a/drivers/staging/zcache/Kconfig +++ b/drivers/staging/zcache/Kconfig @@ -1,5 +1,5 @@ config ZCACHE - tristate "Dynamic compression of swap pages and clean pagecache pages" + bool "Dynamic compression of swap pages and clean pagecache pages" depends on CLEANCACHE || FRONTSWAP select XVMALLOC select LZO_COMPRESS