Skip to content

Commit

Permalink
mm/swap: make NODE_DATA an inline function on CONFIG_FLATMEM
Browse files Browse the repository at this point in the history
make W=1 generates the following warning in mm/workingset.c for allnoconfig

  mm/workingset.c: In function `unpack_shadow':
  mm/workingset.c:201:15: warning: variable `nid' set but not used [-Wunused-but-set-variable]
    int memcgid, nid;
                 ^~~

On FLATMEM, NODE_DATA returns a global pglist_data without dereferencing
nid.  Make the helper an inline function to suppress the warning, add type
checking and to apply any side-effects in the parameter list.

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Mel Gorman <[email protected]>
Reviewed-by: Yang Shi <[email protected]>
Acked-by: Vlastimil Babka <[email protected]>
Cc: Dan Streetman <[email protected]>
Cc: David Hildenbrand <[email protected]>
Cc: Michal Hocko <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
gormanm authored and torvalds committed Jul 1, 2021
1 parent ffd8f25 commit 351de44
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion include/linux/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,10 @@ extern char numa_zonelist_order[];
#ifndef CONFIG_NUMA

extern struct pglist_data contig_page_data;
#define NODE_DATA(nid) (&contig_page_data)
static inline struct pglist_data *NODE_DATA(int nid)
{
return &contig_page_data;
}
#define NODE_MEM_MAP(nid) mem_map

#else /* CONFIG_NUMA */
Expand Down

0 comments on commit 351de44

Please sign in to comment.