From efed7451823716ef4bb8a5131ae5b11fc20d92d7 Mon Sep 17 00:00:00 2001 From: Toshi Kani Date: Wed, 13 Mar 2013 14:59:31 -0700 Subject: [PATCH] --- yaml --- r: 361282 b: refs/heads/master c: f8749452adcddd62e3707709ec2ae4856e70a3f2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/memory_hotplug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f7b2fad33b6e..404475cfdcc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebf47beb660e5580df7bee06d5cf9d37c0f22fac +refs/heads/master: f8749452adcddd62e3707709ec2ae4856e70a3f2 diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c index b81a367b9f39..9597eec8239d 100644 --- a/trunk/mm/memory_hotplug.c +++ b/trunk/mm/memory_hotplug.c @@ -1801,7 +1801,7 @@ int __ref remove_memory(int nid, u64 start, u64 size) int retry = 1; start_pfn = PFN_DOWN(start); - end_pfn = start_pfn + PFN_DOWN(size); + end_pfn = PFN_UP(start + size - 1); /* * When CONFIG_MEMCG is on, one memory block may be used by other