Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a63fdc51 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header 



The macro MIN_MEMORY_BLOCK_SIZE is currently defined twice in two .c
files, and I need it in a third one to fix a powerpc bug, so let's
first move it into a header

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 620917de

arch/x86/mm/init_64.c

+1 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/poison.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/memory.h>

#include <linux/memory_hotplug.h>

#include <linux/nmi.h>

#include <linux/gfp.h>
@@ -895,8 +896,6 @@ const char *arch_vma_name(struct vm_area_struct *vma) 
}



#ifdef CONFIG_X86_UV

#define MIN_MEMORY_BLOCK_SIZE   (1 << SECTION_SIZE_BITS)



unsigned long memory_block_size_bytes(void)

{

	if (is_uv_system()) {

drivers/base/memory.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
static DEFINE_MUTEX(mem_sysfs_mutex);



#define MEMORY_CLASS_NAME	"memory"

#define MIN_MEMORY_BLOCK_SIZE	(1 << SECTION_SIZE_BITS)



static int sections_per_block;

include/linux/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <linux/compiler.h>

#include <linux/mutex.h>



#define MIN_MEMORY_BLOCK_SIZE     (1 << SECTION_SIZE_BITS)



struct memory_block {

	unsigned long start_section_nr;

	unsigned long end_section_nr;