2009-09-15 19:36:34

by Pekka Enberg

[permalink] [raw]
Subject: [GIT PULL] SLAB fix for 2.6.32-rc0

Hi Linus,

Here's a build breakage fix from Ingo for !CONFIG_SLUB_DEBUG configs.

Pekka

The following changes since commit 0cb583fd2862f19ea88b02eb307d11c09e51e2f8:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/ide-next-2.6

are available in the git repository at:

ssh://master.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 slab/urgent

Ingo Molnar (1):
slub: Fix build error in kmem_cache_open() with !CONFIG_SLUB_DEBUG

mm/slub.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index a5789b9..0a216aa 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1071,6 +1071,8 @@ static inline unsigned long kmem_cache_flags(unsigned long objsize,
}
#define slub_debug 0

+#define disable_higher_order_debug 0
+
static inline unsigned long slabs_node(struct kmem_cache *s, int node)
{ return 0; }
static inline unsigned long node_nr_slabs(struct kmem_cache_node *n)