diff options
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 65d55056b6e7..a0484adbf59d 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -298,7 +298,7 @@ struct add_highpages_data { | |||
298 | unsigned long end_pfn; | 298 | unsigned long end_pfn; |
299 | }; | 299 | }; |
300 | 300 | ||
301 | static void __init add_highpages_work_fn(unsigned long start_pfn, | 301 | static int __init add_highpages_work_fn(unsigned long start_pfn, |
302 | unsigned long end_pfn, void *datax) | 302 | unsigned long end_pfn, void *datax) |
303 | { | 303 | { |
304 | int node_pfn; | 304 | int node_pfn; |
@@ -311,7 +311,7 @@ static void __init add_highpages_work_fn(unsigned long start_pfn, | |||
311 | final_start_pfn = max(start_pfn, data->start_pfn); | 311 | final_start_pfn = max(start_pfn, data->start_pfn); |
312 | final_end_pfn = min(end_pfn, data->end_pfn); | 312 | final_end_pfn = min(end_pfn, data->end_pfn); |
313 | if (final_start_pfn >= final_end_pfn) | 313 | if (final_start_pfn >= final_end_pfn) |
314 | return; | 314 | return 0; |
315 | 315 | ||
316 | for (node_pfn = final_start_pfn; node_pfn < final_end_pfn; | 316 | for (node_pfn = final_start_pfn; node_pfn < final_end_pfn; |
317 | node_pfn++) { | 317 | node_pfn++) { |
@@ -321,6 +321,8 @@ static void __init add_highpages_work_fn(unsigned long start_pfn, | |||
321 | add_one_highpage_init(page, node_pfn); | 321 | add_one_highpage_init(page, node_pfn); |
322 | } | 322 | } |
323 | 323 | ||
324 | return 0; | ||
325 | |||
324 | } | 326 | } |
325 | 327 | ||
326 | void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn, | 328 | void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn, |