Messages in this thread | | | Subject | Re: [PATCH 1/2] mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header | From | Benjamin Herrenschmidt <> | Date | Wed, 29 Jun 2011 13:40:40 +1000 |
| |
On Tue, 2011-06-14 at 10:57 +1000, Benjamin Herrenschmidt wrote: > 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: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > > Ingo, Thomas: Who needs to ack the x86 bit ? I'd like to send that > to Linus asap with the powerpc fix.
Anybody ? Allo ?
I'm happy to send that to Linus myself but I'd like at least on or two acks :-)
Cheers, Ben.
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index d865c4a..bbaaa00 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -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()) { > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index 9f9b235..45d7c8f 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -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; > > diff --git a/include/linux/memory.h b/include/linux/memory.h > index e1e3b2b..935699b 100644 > --- a/include/linux/memory.h > +++ b/include/linux/memory.h > @@ -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; >
| |