[yakkety/master-next 1/1] UBUNTU: [Config] switch squashfs to single threaded decode

[Andy Whitcroft]

There is some issue with squashfs decoding when done in a multi-threaded
manner which leads to large memory consumption.  Either we have a leak
or more probabally we have pathalogical case leading to horrible internal
fragmentation.  For the moment turn it off while it can be investigated.

BugLink: http://bugs.launchpad.net/bugs/1636847
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 2 --
 debian.master/config/arm64/config.common.arm64     | 2 --
 debian.master/config/armhf/config.common.armhf     | 2 --
 debian.master/config/config.common.ubuntu          | 2 ++
 debian.master/config/i386/config.common.i386       | 2 --
 debian.master/config/powerpc/config.common.powerpc | 2 --
 debian.master/config/ppc64el/config.common.ppc64el | 2 --
 debian.master/config/s390x/config.common.s390x     | 2 --
 8 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9da9119..6614ae0 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -589,8 +589,6 @@ CONFIG_SPI=y
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPMI=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_LZ4=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index f027204..a7e10eb 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -646,8 +646,6 @@ CONFIG_SPI_ROCKCHIP=m
 # CONFIG_SPI_SH_HSPI is not set
 # CONFIG_SPI_SH_MSIOF is not set
 CONFIG_SPMI=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_LZ4=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index f23b5f3..263fb04 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -619,8 +619,6 @@ CONFIG_SPI_RSPI=m
 CONFIG_SPI_SH_HSPI=m
 CONFIG_SPI_SH_MSIOF=m
 CONFIG_SPMI=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_LZ4=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4b8bac8..470e337 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7870,6 +7870,8 @@ CONFIG_SPU_FS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 CONFIG_SQUASHFS_LZO=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index b040613..6e01089 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -581,8 +581,6 @@ CONFIG_SPI=y
 CONFIG_SPI_PXA2XX_PCI=m
 # CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPMI=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_LZ4=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index b799f4b..011e182 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -560,8 +560,6 @@ CONFIG_SOUND=m
 CONFIG_SPI=y
 # CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPMI=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_LZ4=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 5623954..c4a37cd 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -626,8 +626,6 @@ CONFIG_SPI=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPMI=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_LZ4=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index d644d22..8473ddf 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -497,8 +497,6 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SOUND is not set
 # CONFIG_SPI is not set
 # CONFIG_SPMI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
 CONFIG_SQUASHFS_FILE_CACHE=y
 # CONFIG_SQUASHFS_FILE_DIRECT is not set
 # CONFIG_SQUASHFS_LZ4 is not set
-- 
2.9.3