On Mon, 12 May 2014, Fabio Estevam wrote:
> diff --git a/mm/slub.c b/mm/slub.c
> index 4d5002f..0a642a4 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -2127,12 +2127,6 @@ static inline int node_match(struct page *page, int node)
> return 1;
> }
>
> -#ifdef CONFIG_SLUB_DEBUG
> -static int count_free(struct page *page)
> -{
> - return page->objects - page->inuse;
> -}
> -
> static unsigned long count_partial(struct kmem_cache_node *n,
> int (*get_count)(struct page *))
This is wrong, gcc will now complain that count_partial() is unused if
CONFIG_SYSFS is disabled.
> {
> @@ -2147,6 +2141,12 @@ static unsigned long count_partial(struct kmem_cache_node *n,
> return x;
> }
>
> +#ifdef CONFIG_SLUB_DEBUG
> +static int count_free(struct page *page)
> +{
> + return page->objects - page->inuse;
> +}
> +
> static inline unsigned long node_nr_objs(struct kmem_cache_node *n)
> {
> return atomic_long_read(&n->total_objects);
node_nr_objs() need only be defined when CONFIG_SLUB_DEBUG, there's no
need for an #else variant that simply returns 0. (CONFIG_SLABINFO
requires CONFIG_SLUB_DEBUG.)
Please see http://marc.info/?l=linux-mm-commits&m=139992385527040 that has
been merged into -mm which is the correct fix.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>