Commit eb1f01d5 authored by Nick Piggin's avatar Nick Piggin Committed by Pekka Enberg

SLQB: Add mm/slqb.c to Kbuild

This patch adds SLQB to Kbuild. It's separated from the original patch to make
sure we don't break git bisect due to early slab changes in mainline while SLQB
was being developed.

[ penberg@cs.helsinki.fi: cut'n paste from Nick's initial patch ]
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent ee421bb5
...@@ -1010,7 +1010,7 @@ config COMPAT_BRK ...@@ -1010,7 +1010,7 @@ config COMPAT_BRK
choice choice
prompt "Choose SLAB allocator" prompt "Choose SLAB allocator"
default SLUB default SLQB
help help
This option allows to select a slab allocator. This option allows to select a slab allocator.
...@@ -1031,6 +1031,11 @@ config SLUB ...@@ -1031,6 +1031,11 @@ config SLUB
and has enhanced diagnostics. SLUB is the default choice for and has enhanced diagnostics. SLUB is the default choice for
a slab allocator. a slab allocator.
config SLQB
bool "SLQB (Queued allocator)"
help
SLQB is a proposed new slab allocator.
config SLOB config SLOB
depends on EMBEDDED depends on EMBEDDED
bool "SLOB (Simple Allocator)" bool "SLOB (Simple Allocator)"
...@@ -1086,7 +1091,7 @@ config HAVE_GENERIC_DMA_COHERENT ...@@ -1086,7 +1091,7 @@ config HAVE_GENERIC_DMA_COHERENT
config SLABINFO config SLABINFO
bool bool
depends on PROC_FS depends on PROC_FS
depends on SLAB || SLUB_DEBUG depends on SLAB || SLUB_DEBUG || SLQB
default y default y
config RT_MUTEXES config RT_MUTEXES
......
...@@ -336,6 +336,26 @@ config SLUB_STATS ...@@ -336,6 +336,26 @@ config SLUB_STATS
out which slabs are relevant to a particular load. out which slabs are relevant to a particular load.
Try running: slabinfo -DA Try running: slabinfo -DA
config SLQB_DEBUG
default y
bool "Enable SLQB debugging support"
depends on SLQB
config SLQB_DEBUG_ON
default n
bool "SLQB debugging on by default"
depends on SLQB_DEBUG
config SLQB_SYSFS
bool "Create SYSFS entries for slab caches"
default n
depends on SLQB
config SLQB_STATS
bool "Enable SLQB performance statistics"
default n
depends on SLQB_SYSFS
config DEBUG_KMEMLEAK config DEBUG_KMEMLEAK
bool "Kernel memory leak detector" bool "Kernel memory leak detector"
depends on DEBUG_KERNEL && EXPERIMENTAL && (X86 || ARM) && \ depends on DEBUG_KERNEL && EXPERIMENTAL && (X86 || ARM) && \
......
...@@ -28,6 +28,7 @@ obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o ...@@ -28,6 +28,7 @@ obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
obj-$(CONFIG_PAGE_POISONING) += debug-pagealloc.o obj-$(CONFIG_PAGE_POISONING) += debug-pagealloc.o
obj-$(CONFIG_SLAB) += slab.o obj-$(CONFIG_SLAB) += slab.o
obj-$(CONFIG_SLUB) += slub.o obj-$(CONFIG_SLUB) += slub.o
obj-$(CONFIG_SLQB) += slqb.o
obj-$(CONFIG_KMEMCHECK) += kmemcheck.o obj-$(CONFIG_KMEMCHECK) += kmemcheck.o
obj-$(CONFIG_FAILSLAB) += failslab.o obj-$(CONFIG_FAILSLAB) += failslab.o
obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment