From fc50a9a0658a797c602ba0f1faec2a508a6b24a2 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@debian.org>
Date: Fri, 19 Dec 2014 08:54:22 +0000
Subject: [PATCH] [armel/kirkwood] Disable ZSMALLOC

svn path=/dists/sid/linux/; revision=22207
---
 debian/changelog                    |  1 +
 debian/config/armel/config.kirkwood |  1 +
 debian/config/armel/defines         | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da5295415..f6cf32022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ linux (3.16.7-ckt2-2) UNRELEASED; urgency=medium
     - [/kirkwood] Disable RD_LZO and RD_LZ4
     - [/kirkwood] mm: Disable KSM
     - [/kirkwood] Disable CHECKPOINT_RESTORE
+    - [/kirkwood] Disable ZSMALLOC
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 13 Dec 2014 11:45:48 +0000
 
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 6aa776600..8b7c5bd53 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -643,6 +643,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
 # CONFIG_KSM is not set
+# CONFIG_ZSMALLOC is not set
 
 ##
 ## file: net/atm/Kconfig
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 1624ae5b0..16de81755 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -40,6 +40,17 @@ recommends: uboot-mkimage
 # QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
 check-size: 2097080
 
+[kirkwood_abi]
+ignore-changes:
+ # Disabled in 3.16.7-ckt2-2 to reduce image size (#772983)
+ zs_create_pool
+ zs_destroy_pool
+ zs_free
+ zs_get_total_size_bytes
+ zs_malloc
+ zs_map_object
+ zs_unmap_object
+
 [orion5x_description]
 hardware: Marvell Orion
 hardware-long: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-209, etc)