From: Tim Gardner Date: Thu, 22 Sep 2016 13:46:38 +0000 (-0600) Subject: UBUNTU: [Config] CONFIG_SLUB=y X-Git-Tag: Ubuntu-4.10.0-9.11~330 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e12db2ede3557554edbaca56ce112dd9d7b5cb6c;p=mirror_ubuntu-zesty-kernel.git UBUNTU: [Config] CONFIG_SLUB=y BugLink: http://bugs.launchpad.net/bugs/1626564 Signed-off-by: Tim Gardner --- diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index d52bdfe06310..331f97fdbd63 100644 --- 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 e3d769f8a8db..8ea199b7193d 100644 --- 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 note # 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 424ec7dd0fee..d195f2f0d10f 100644 --- 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 13449acc35ef..9a9eecf24038 100644 --- 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 88301621cabb..558784fd3c7b 100644 --- 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 9b82bb12603a..398717297f57 100644 --- 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 bfff6ed195cb..c36855773513 100644 --- 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 df194d425b27..ab06f493e0db 100644 --- 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 440cd4740803..50ddd64126b3 100644 --- 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 ee316f2487ad..631fac1f78b8 100644 --- 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 8d3fc758765a..c94167e51ebd 100644 --- 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 ab4f6785cfb9..8e7df94e4e01 100644 --- 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