diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /mm/memory_hotplug.c | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 431a64f021c0..f6d4af8af8a8 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -104,7 +104,7 @@ static void grow_pgdat_span(struct pglist_data *pgdat, | |||
| 104 | pgdat->node_start_pfn = start_pfn; | 104 | pgdat->node_start_pfn = start_pfn; |
| 105 | 105 | ||
| 106 | if (end_pfn > old_pgdat_end_pfn) | 106 | if (end_pfn > old_pgdat_end_pfn) |
| 107 | pgdat->node_spanned_pages = end_pfn - pgdat->node_spanned_pages; | 107 | pgdat->node_spanned_pages = end_pfn - pgdat->node_start_pfn; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | int online_pages(unsigned long pfn, unsigned long nr_pages) | 110 | int online_pages(unsigned long pfn, unsigned long nr_pages) |