[-mm] list, perf: fix list_force_poison() build regression
diff mbox

Message ID 20160101032348.26352.75121.stgit@dwillia2-desk3.amr.corp.intel.com
State New, archived
Headers show

Commit Message

Dan Williams Jan. 1, 2016, 3:24 a.m. UTC
In file included from
    /home/sfr/next/next/tools/include/linux/list.h:5:0,
                     from arch/../util/map.h:6,
                     from arch/../util/event.h:8,
                     from arch/../util/debug.h:7,
                     from arch/common.c:4:
    include/linux/list.h: In function 'list_force_poison':
    include/linux/list.h:123:56: error: unused parameter 'entry' [-Werror=unused-parameter]
     static inline void list_force_poison(struct list_head *entry)

perf does not like the empty definition of list_force_poison.  For
simplicity just switch to list_del in the non-debug case.

Fixes "mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup" in
-next.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 include/linux/list.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Stephen Rothwell Jan. 4, 2016, 7:47 a.m. UTC | #1
Hi Dan,

On Thu, 31 Dec 2015 19:24:21 -0800 Dan Williams <dan.j.williams@intel.com> wrote:
>
>     In file included from
>     /home/sfr/next/next/tools/include/linux/list.h:5:0,
>                      from arch/../util/map.h:6,
>                      from arch/../util/event.h:8,
>                      from arch/../util/debug.h:7,
>                      from arch/common.c:4:
>     include/linux/list.h: In function 'list_force_poison':
>     include/linux/list.h:123:56: error: unused parameter 'entry' [-Werror=unused-parameter]
>      static inline void list_force_poison(struct list_head *entry)
> 
> perf does not like the empty definition of list_force_poison.  For
> simplicity just switch to list_del in the non-debug case.
> 
> Fixes "mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup" in
> -next.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  include/linux/list.h |    5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/list.h b/include/linux/list.h
> index d870ba3315f8..ebf5f358e8c3 100644
> --- a/include/linux/list.h
> +++ b/include/linux/list.h
> @@ -120,9 +120,8 @@ extern void list_del(struct list_head *entry);
>   */
>  extern void list_force_poison(struct list_head *entry);
>  #else
> -static inline void list_force_poison(struct list_head *entry)
> -{
> -}
> +/* fallback to the less strict LIST_POISON* definitions */
> +#define list_force_poison list_del
>  #endif
>  
>  /**

I applied this to linux-next today.

Patch
diff mbox

diff --git a/include/linux/list.h b/include/linux/list.h
index d870ba3315f8..ebf5f358e8c3 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -120,9 +120,8 @@  extern void list_del(struct list_head *entry);
  */
 extern void list_force_poison(struct list_head *entry);
 #else
-static inline void list_force_poison(struct list_head *entry)
-{
-}
+/* fallback to the less strict LIST_POISON* definitions */
+#define list_force_poison list_del
 #endif
 
 /**