From patchwork Fri May 2 15:39:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 345042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 855CF14010B; Sat, 3 May 2014 01:40:35 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WgFZg-0004c9-EZ; Fri, 02 May 2014 15:40:32 +0000 Received: from mail.tpi.com ([74.45.170.26]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WgFYs-00043c-PI for kernel-team@lists.ubuntu.com; Fri, 02 May 2014 15:39:42 +0000 Received: from salmon.rtg.net (mail.tpi.com [10.0.0.205]) by mail.tpi.com (Postfix) with ESMTP id C7B5D355636; Fri, 2 May 2014 08:39:48 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id 695C0246A0; Fri, 2 May 2014 09:39:41 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Trusty SRU] UBUNTU: [Config] CONFIG_ZSWAP=y Date: Fri, 2 May 2014 09:39:35 -0600 Message-Id: <1399045175-112981-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1315203 Requires a kernel command line parameter (zswap.enabled) to enable. Signed-off-by: Tim Gardner Acked-by: Andy Whitcroft --- debian.master/config/config.common.ubuntu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 9f08f29..1d7a0fd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7467,7 +7467,7 @@ CONFIG_YENTA_TI=y CONFIG_YENTA_TOSHIBA=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 -# CONFIG_ZBUD is not set +CONFIG_ZBUD=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZEROPLUS_FF=y @@ -7478,4 +7478,4 @@ CONFIG_ZONE_DMA=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set CONFIG_ZSMALLOC=y -# CONFIG_ZSWAP is not set +CONFIG_ZSWAP=y