UBUNTU: [Config] CONFIG_SLUB=y

BugLink: http://bugs.launchpad.net/bugs/1626564
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d52bdfe063105914790ed7287c844f6c22b6f2f0..331f97fdbd639c5783c4de0465c52be499d8bdaa 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -1182,10 +1182,8 @@ CONFIG_SGI_PARTITION=y
 CONFIG_SIGMATEL_FIR=m
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 CONFIG_SIS900=m
-CONFIG_SLAB=y
 CONFIG_SLHC=m
 CONFIG_SLIP=m
-# CONFIG_SLUB is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SM_FTL is not set

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e3d769f8a8db5424f1ba6edbf757514887aa32c9..8ea199b7193d635eec59603238fdb18628885da5 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7734,6 +7734,8 @@ CONFIG_IRQ_TIME_ACCOUNTING                      policy<{'amd64': 'n', 'armhf': '
 CONFIG_SLAB                                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_SLUB                                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SLOB                                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+#
+CONFIG_SLUB                                    mark<ENFORCED> note<LP:1626564>
 
 # Menu: General setup >> Configure standard kernel features (expert users)
 CONFIG_EXPERT                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 424ec7dd0feed7ffbff920418c100c4d8fa5e50e..d195f2f0d10fefba3f213522200511301d870ddf 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -1229,10 +1229,8 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SIGMATEL_FIR=m
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 # CONFIG_SIS900 is not set
-CONFIG_SLAB=y
 CONFIG_SLHC=m
 CONFIG_SLIP=m
-# CONFIG_SLUB is not set
 CONFIG_SMSC911X=m
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SM_FTL is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 13449acc35efbf4562636247aae4914b2abd0bb8..9a9eecf2403890d4a56b5eef77c84f36fb1e4933 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -1272,10 +1272,8 @@ CONFIG_SG_SPLIT=y
 CONFIG_SIGMATEL_FIR=m
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 # CONFIG_SIS900 is not set
-CONFIG_SLAB=y
 CONFIG_SLHC=m
 CONFIG_SLIP=m
-# CONFIG_SLUB is not set
 CONFIG_SMSC911X=m
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SM_FTL is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 88301621cabbae2f3197b147af667b9b1df02e59..558784fd3c7b50107a4e8f9c5ca6d93e8b35df0a 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1614,7 +1614,6 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -2549,6 +2548,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 # CONFIG_HAVE_ARCH_HASH is not set
@@ -6274,6 +6274,7 @@ CONFIG_SKGE=m
 CONFIG_SKGE_GENESIS=y
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
+# CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SLICOSS is not set
@@ -6282,6 +6283,7 @@ CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_MODE_SLIP6=y
 CONFIG_SLIP_SMART=y
 # CONFIG_SLOB is not set
+CONFIG_SLUB=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 9b82bb12603ac990ba962c93058801f1489914ee..398717297f579dad7df7d88fcef63ee2aef0c12a 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -1239,10 +1239,8 @@ CONFIG_SGI_PARTITION=y
 CONFIG_SIGMATEL_FIR=m
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 CONFIG_SIS900=m
-CONFIG_SLAB=y
 CONFIG_SLHC=m
 CONFIG_SLIP=m
-# CONFIG_SLUB is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SM_FTL is not set

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index bfff6ed195cb3f24936299a074840652b52abab1..c36855773513c6aba69b00af6deea74e6564deb6 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -875,9 +875,7 @@ CONFIG_SERIO_LIBPS2=m
 # CONFIG_SIGMATEL_FIR is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 # CONFIG_SIMPLE_GPIO is not set
-CONFIG_SLAB=y
 CONFIG_SLHC=m
-# CONFIG_SLUB is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SND_ALI5451 is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index df194d425b27c110981fda41128d815432c1a22b..ab06f493e0db1f0fb93d9c279b9e5fd9a0287be5 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -887,9 +887,7 @@ CONFIG_SI7020=m
 CONFIG_SIGMATEL_FIR=m
 CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 CONFIG_SIMPLE_GPIO=y
-# CONFIG_SLAB is not set
 CONFIG_SLHC=y
-CONFIG_SLUB=y
 CONFIG_SMSC911X=m
 CONFIG_SMS_SIANO_DEBUGFS=y
 CONFIG_SND_ALI5451=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 440cd4740803091fb7f4b9d02f4e96747c3e56b3..50ddd64126b3f04cc5fe2a99ed7288cffc30cdba 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -886,9 +886,7 @@ CONFIG_SERIO_LIBPS2=m
 # CONFIG_SIGMATEL_FIR is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 # CONFIG_SIMPLE_GPIO is not set
-CONFIG_SLAB=y
 CONFIG_SLHC=m
-# CONFIG_SLUB is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SND_ALI5451 is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index ee316f2487addce5781557b1d0b9004b654563f9..631fac1f78b84e313293a8a7bfd31655988b1c6e 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -895,9 +895,7 @@ CONFIG_SI7020=m
 CONFIG_SIGMATEL_FIR=m
 CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 CONFIG_SIMPLE_GPIO=y
-# CONFIG_SLAB is not set
 CONFIG_SLHC=y
-CONFIG_SLUB=y
 CONFIG_SMSC911X=m
 CONFIG_SMS_SIANO_DEBUGFS=y
 CONFIG_SND_ALI5451=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 8d3fc758765aa617abdbbbe4e8a75cfc12e7ca15..c94167e51ebd51c0bd44f8594cebcb75f25615fd 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -1192,10 +1192,8 @@ CONFIG_SGETMASK_SYSCALL=y
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 # CONFIG_SIMPLE_GPIO is not set
 CONFIG_SIS900=m
-CONFIG_SLAB=y
 CONFIG_SLHC=m
 CONFIG_SLIP=m
-# CONFIG_SLUB is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMS_SIANO_DEBUGFS is not set
 # CONFIG_SND_ALI5451 is not set

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index ab4f6785cfb96345bf6f516f95c3fcc379c2f5ea..8e7df94e4e017d69df9df7a882870f6845615105 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -801,9 +801,7 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SI7020 is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 # CONFIG_SIS900 is not set
-CONFIG_SLAB=y
 # CONFIG_SLIP is not set
-# CONFIG_SLUB is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_SND_ALI5451 is not set