Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361282
b: refs/heads/master
c: f874945
h: refs/heads/master
v: v3
  • Loading branch information
Toshi Kani authored and Linus Torvalds committed Mar 13, 2013
1 parent 5105058 commit efed745
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: ebf47beb660e5580df7bee06d5cf9d37c0f22fac
refs/heads/master: f8749452adcddd62e3707709ec2ae4856e70a3f2
2 changes: 1 addition & 1 deletion trunk/mm/memory_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit efed745

Please sign in to comment.