| Message ID | 4CA62A51.70807@austin.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, Oct 01, 2010 at 01:37:05PM -0500, Nathan Fontenot wrote: > Define a version of memory_block_size_bytes for x86_64 when CONFIG_X86_UV is > set. > > Signed-off-by: Robin Holt <holt@sgi.com> > Signed-off-by: Jack Steiner <steiner@sgi.com> I think this technically needs a Signed-off-by: <you> since you are passing it upstream. > > --- > arch/x86/mm/init_64.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > Index: linux-next/arch/x86/mm/init_64.c > =================================================================== > --- linux-next.orig/arch/x86/mm/init_64.c 2010-09-29 14:56:25.000000000 -0500 > +++ linux-next/arch/x86/mm/init_64.c 2010-10-01 13:00:50.000000000 -0500 > @@ -51,6 +51,7 @@ > #include <asm/numa.h> > #include <asm/cacheflush.h> > #include <asm/init.h> > +#include <asm/uv/uv.h> > #include <linux/bootmem.h> > > static int __init parse_direct_gbpages_off(char *arg) > @@ -902,6 +903,19 @@ > return NULL; > } > > +#ifdef CONFIG_X86_UV > +#define MIN_MEMORY_BLOCK_SIZE (1 << SECTION_SIZE_BITS) > + > +unsigned long memory_block_size_bytes(void) > +{ > + if (is_uv_system()) { > + printk(KERN_INFO "UV: memory block size 2GB\n"); > + return 2UL * 1024 * 1024 * 1024; > + } > + return MIN_MEMORY_BLOCK_SIZE; > +} > +#endif > + > #ifdef CONFIG_SPARSEMEM_VMEMMAP > /* > * Initialise the sparsemem vmemmap using huge-pages at the PMD level. >
Index: linux-next/arch/x86/mm/init_64.c =================================================================== --- linux-next.orig/arch/x86/mm/init_64.c 2010-09-29 14:56:25.000000000 -0500 +++ linux-next/arch/x86/mm/init_64.c 2010-10-01 13:00:50.000000000 -0500 @@ -51,6 +51,7 @@ #include <asm/numa.h> #include <asm/cacheflush.h> #include <asm/init.h> +#include <asm/uv/uv.h> #include <linux/bootmem.h> static int __init parse_direct_gbpages_off(char *arg) @@ -902,6 +903,19 @@ return NULL; } +#ifdef CONFIG_X86_UV +#define MIN_MEMORY_BLOCK_SIZE (1 << SECTION_SIZE_BITS) + +unsigned long memory_block_size_bytes(void) +{ + if (is_uv_system()) { + printk(KERN_INFO "UV: memory block size 2GB\n"); + return 2UL * 1024 * 1024 * 1024; + } + return MIN_MEMORY_BLOCK_SIZE; +} +#endif + #ifdef CONFIG_SPARSEMEM_VMEMMAP /* * Initialise the sparsemem vmemmap using huge-pages at the PMD level.