From fdffaeee6a79b4b68f4ec0aaf0a251d190d404f9 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 15 Sep 2011 06:26:15 +1000 Subject: [PATCH] --- yaml --- r: 264875 b: refs/heads/master c: 61b94feafa1c59a1de2719d23294dea6fd4ca362 h: refs/heads/master i: 264873: 3b93feacb42af740e4efa4cdaca9d7fa7d99050c 264871: 9481a5d6e1579f47d8732cd9f09c3be29bcc3924 v: v3 --- [refs] | 2 +- trunk/drivers/base/memory.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 16b02520e5b3..c31735673b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 220c1ed1bd64b26a2edcd59ca9ff031e1b880727 +refs/heads/master: 61b94feafa1c59a1de2719d23294dea6fd4ca362 diff --git a/trunk/drivers/base/memory.c b/trunk/drivers/base/memory.c index 2840ed4668c1..2a0b5f1020ed 100644 --- a/trunk/drivers/base/memory.c +++ b/trunk/drivers/base/memory.c @@ -380,9 +380,13 @@ memory_probe_store(struct class *class, struct class_attribute *attr, u64 phys_addr; int nid; int i, ret; + unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block; phys_addr = simple_strtoull(buf, NULL, 0); + if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1)) + return -EINVAL; + for (i = 0; i < sections_per_block; i++) { nid = memory_add_physaddr_to_nid(phys_addr); ret = add_memory(nid, phys_addr,