---

yaml --- r: 235469 b: refs/heads/master c: 6add7cd h: refs/heads/master i: 235467: eda0f1a v: v3
git-mirror · Feb 4, 2011 · 4e7962e · 4e7962e
1 parent 9ec06c1
commit 4e7962e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dc41aa6d6172d61c10638d11933a3595a41d51a
+refs/heads/master: 6add7cd618b4d4dc525731beb539c5e06e891855
diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c
@@ -387,12 +387,19 @@ memory_probe_store(struct class *class, struct class_attribute *attr,
 {
 	u64 phys_addr;
 	int nid;
-	int ret;
+	int i, ret;
 
 	phys_addr = simple_strtoull(buf, NULL, 0);
 
-	nid = memory_add_physaddr_to_nid(phys_addr);
-	ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT);
+	for (i = 0; i < sections_per_block; i++) {
+		nid = memory_add_physaddr_to_nid(phys_addr);
+		ret = add_memory(nid, phys_addr,
+				 PAGES_PER_SECTION << PAGE_SHIFT);
+		if (ret)
+			break;
+
+		phys_addr += MIN_MEMORY_BLOCK_SIZE;
+	}
 
 	if (ret)
 		count = ret;