mm: slub: Fix compilation without CONFIG_SLUB_DEBUG
Subsystems (2)
PATCH 1/1 mm: slub: Fix compilation without CONFIG_SLUB_DEBUG
Since the introduction of count_partial_free_approx the compilation of linux fails with an implicit declaration of function ‘node_nr_objs’ because count_partial_free_approx is compiled when SLAB_SUPPORTS_SYSFS is defined even without CONFIG_SLUB_DEBUG. As count_partial_free_approx is only used when CONFIG_SLUB_DEBUG is defined it should only be compiled in that case.
--- mm/slub.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
mm/slub.c +3 -4
@@ -3226,6 +3226,7 @@ static inline int node_match(struct slab *slab, int node) }#ifdef CONFIG_SLUB_DEBUG +#define MAX_PARTIAL_TO_SCAN 10000static int count_free (struct slab *slab) {return slab->objects - slab->inuse;
@@ -3293,10 +3294,6 @@ static inline bool free_debug_processing(struct kmem_cache *s,return checks_ok; } -#endif /* CONFIG_SLUB_DEBUG */ - -#if defined(CONFIG_SLUB_DEBUG ) || defined(SLAB_SUPPORTS_SYSFS ) -#define MAX_PARTIAL_TO_SCAN 10000static unsigned long count_partial_free_approx (struct kmem_cache_node *n) {
@@ -3332,7 +3329,9 @@ static unsigned long count_partial_free_approx(struct kmem_cache_node *n)spin_unlock_irqrestore (&n->list_lock, flags);return x; } +#endif /* CONFIG_SLUB_DEBUG */ +#if defined(CONFIG_SLUB_DEBUG ) || defined(SLAB_SUPPORTS_SYSFS )static unsigned long count_partial (struct kmem_cache_node *n,int (*get_count)(struct slab *)) {
--
2.43.0
Re: [External] : [PATCH] mm: slub: Fix compilation without CONFIG_SLUB_DEBUG
Quoted 7 lines · Bert Karwatzki
Since the introduction of
count_partial_free_approxthe compilation of linux fails with an implicit declaration of function ‘node_nr_objs’ becausecount_partial_free_approxis compiled whenSLAB_SUPPORTS_SYSFSis defined even withoutCONFIG_SLUB_DEBUG. Ascount_partial_free_approxis only used whenCONFIG_SLUB_DEBUGis defined it should only be compiled in that case.
Hi Bert,
Thanks for noticing this.
The original patch was updated to fix it and was sent to the MM maillist. It has been applied several hours ago.
Quoted 42 lines
Fixes commit 1c5610f451be ("slub: introduce count_partial_free_approx()")Signed-off-by Bert Karwatzki <[email protected]>--- mm/slub.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)mm/slub.c +3
-5@@ -3226,6 +3226,7 @@ static inline int node_match(struct slab *slab, int node) }#ifdef CONFIG_SLUB_DEBUG +#define MAX_PARTIAL_TO_SCAN 10000static int count_free (struct slab *slab) {return slab->objects - slab->inuse;@@ -3293,10 +3294,6 @@ static inline bool free_debug_processing(struct kmem_cache *s,return checks_ok; } -#endif /* CONFIG_SLUB_DEBUG */ - -#if defined(CONFIG_SLUB_DEBUG ) || defined(SLAB_SUPPORTS_SYSFS ) -#define MAX_PARTIAL_TO_SCAN 10000static unsigned long count_partial_free_approx (struct kmem_cache_node *n) {@@ -3332,7 +3329,9 @@ static unsigned long count_partial_free_approx(struct kmem_cache_node *n)spin_unlock_irqrestore (&n->list_lock, flags);return x; } +#endif /* CONFIG_SLUB_DEBUG */ +#if defined(CONFIG_SLUB_DEBUG ) || defined(SLAB_SUPPORTS_SYSFS )static unsigned long count_partial (struct kmem_cache_node *n,int (*get_count)(struct slab *)) { --2.43.0