Bootmem needs to work on contiguous memory block quantities rather than whole nodes. So make the maxium number of blocks and the resulting number of blocks per node available to generic code like bootmem. Signed-off-by: Johannes Weiner --- include/linux/numa.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- a/include/linux/numa.h +++ b/include/linux/numa.h @@ -1,13 +1,17 @@ #ifndef _LINUX_NUMA_H #define _LINUX_NUMA_H - #ifdef CONFIG_NODES_SHIFT -#define NODES_SHIFT CONFIG_NODES_SHIFT +#define NODES_SHIFT CONFIG_NODES_SHIFT #else -#define NODES_SHIFT 0 +#define NODES_SHIFT 0 #endif -#define MAX_NUMNODES (1 << NODES_SHIFT) +#define MAX_NUMNODES (1 << NODES_SHIFT) + +#ifndef NR_NODE_MEMBLKS +#define NR_NODE_MEMBLKS MAX_NUMNODES +#endif +#define NR_MEMBLKS_PER_NODE (NR_NODE_MEMBLKS / MAX_NUMNODES) #endif /* _LINUX_NUMA_H */ -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/