Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376276
b: refs/heads/master
c: 348f9f0
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed May 24, 2013
1 parent 37d9176 commit 18677b5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 136e8770cd5d1fe38b3c613100dd6dc4db6d4fa6
refs/heads/master: 348f9f05e0266822fa048f7fb3b039692a0cafbc
9 changes: 6 additions & 3 deletions trunk/mm/memory_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,12 @@ int __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
start = phys_start_pfn << PAGE_SHIFT;
size = nr_pages * PAGE_SIZE;
ret = release_mem_region_adjustable(&iomem_resource, start, size);
if (ret)
pr_warn("Unable to release resource <%016llx-%016llx> (%d)\n",
start, start + size - 1, ret);
if (ret) {
resource_size_t endres = start + size - 1;

pr_warn("Unable to release resource <%pa-%pa> (%d)\n",
&start, &endres, ret);
}

sections_to_remove = nr_pages / PAGES_PER_SECTION;
for (i = 0; i < sections_to_remove; i++) {
Expand Down

0 comments on commit 18677b5

Please sign in to comment.