Commit 14a8262f authored by Yury Norov's avatar Yury Norov Committed by Tejun Heo
Browse files

nodemask: numa: reorganize inclusion path 



Nodemasks now pull linux/numa.h for MAX_NUMNODES and NUMA_NO_NODE
macros. This series makes numa.h depending on nodemasks, so we hit
a circular dependency.

Nodemasks library is highly employed by NUMA code, and it would be
logical to resolve the circular dependency by making NUMA headers
dependent nodemask.h.

Signed-off-by: default avatarYury Norov [NVIDIA] <yury.norov@gmail.com>
Signed-off-by: default avatarAndrea Righi <arighi@nvidia.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7665054e

include/linux/nodemask.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
#include <linux/bitmap.h>

#include <linux/minmax.h>

#include <linux/nodemask_types.h>

#include <linux/numa.h>

#include <linux/random.h>



extern nodemask_t _unused_nodemask_arg_;

include/linux/nodemask_types.h

+10 −1
Original line number Diff line number Diff line
@@ -3,7 +3,16 @@ 
#define __LINUX_NODEMASK_TYPES_H



#include <linux/bitops.h>

#include <linux/numa.h>



#ifdef CONFIG_NODES_SHIFT

#define NODES_SHIFT     CONFIG_NODES_SHIFT

#else

#define NODES_SHIFT     0

#endif



#define MAX_NUMNODES    (1 << NODES_SHIFT)



#define	NUMA_NO_NODE	(-1)



typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;

include/linux/numa.h

+1 −9
Original line number Diff line number Diff line
@@ -3,16 +3,8 @@ 
#define _LINUX_NUMA_H

#include <linux/init.h>

#include <linux/types.h>

#include <linux/nodemask.h>



#ifdef CONFIG_NODES_SHIFT

#define NODES_SHIFT     CONFIG_NODES_SHIFT

#else

#define NODES_SHIFT     0

#endif



#define MAX_NUMNODES    (1 << NODES_SHIFT)



#define	NUMA_NO_NODE	(-1)

#define	NUMA_NO_MEMBLK	(-1)



static inline bool numa_valid_node(int nid)