[0/8] v2 De-Couple sysfs memory directories from memory sections

Message ID 20100930163939.GL14068@sgi.com
State Not Applicable
Headers show

Commit Message

holt@sgi.com Sept. 30, 2010, 4:39 p.m.
On Wed, Sep 29, 2010 at 02:28:30PM -0500, Robin Holt wrote:
> On Tue, Sep 28, 2010 at 01:17:33PM -0500, Nathan Fontenot wrote:
> My next task is to implement a x86_64 SGI UV specific chunk of code
> to memory_block_size_bytes().  Would you consider adding that to your
> patch set?  I expect to have that either later today or early tomorrow.

The patch is below.

I left things at a u32, but I would really like it if you changed to an
unsigned long and adjusted my patch for me.


Subject: [Patch] Implement memory_block_size_bytes for x86_64 when CONFIG_X86_UV

Nathan Fontenot has implemented a patch set for large memory configuration
systems which will combine drivers/base/memory.c memory sections
together into memory blocks with the default behavior being
unchanged from the current behavior.

In his patch set, he implements a memory_block_size_bytes() function
for PPC.  This is the equivalent patch for x86_64 when it has
CONFIG_X86_UV set.

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Jack Steiner <steiner@sgi.com>
To: Nathan Fontenot <nfont@austin.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: lkml <linux-kernel@vger.kernel.org>


 arch/x86/mm/init_64.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)


Index: memory_block/arch/x86/mm/init_64.c
--- memory_block.orig/arch/x86/mm/init_64.c	2010-09-29 14:46:50.711824616 -0500
+++ memory_block/arch/x86/mm/init_64.c	2010-09-29 14:46:55.683997672 -0500
@@ -50,6 +50,7 @@ 
 #include <asm/numa.h>
 #include <asm/cacheflush.h>
 #include <asm/init.h>
+#include <asm/uv/uv.h>
 #include <linux/bootmem.h>
 static unsigned long dma_reserve __initdata;
@@ -928,6 +929,20 @@  const char *arch_vma_name(struct vm_area
 	return NULL;
+#ifdef CONFIG_X86_UV
+u32 memory_block_size_bytes(void)
+	if (is_uv_system()) {
+		printk("UV: memory block size 2GB\n");
+		return 2UL * 1024 * 1024 * 1024;
+	}
  * Initialise the sparsemem vmemmap using huge-pages at the PMD level.