diff options
author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-06-23 05:03:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:42:46 -0400 |
commit | 718127cc3170454f4aa274fdd2f1e01574fecd66 (patch) | |
tree | 8b42a48248d6508b8369718deef6b1af3ea82dbf /include/linux/mmzone.h | |
parent | 86356ab147669bd3bcb2149fd9561d1280835c24 (diff) |
[PATCH] wait_table and zonelist initializing for memory hotadd: add return code for init_current_empty_zone
When add_zone() is called against empty zone (not populated zone), we have to
initialize the zone which didn't initialize at boot time. But,
init_currently_empty_zone() may fail due to allocation of wait table. So,
this patch is to catch its error code.
Changes against wait_table is in the next patch.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r-- | include/linux/mmzone.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 652673ea92f1..e82fc1a52cd0 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -333,6 +333,9 @@ void wakeup_kswapd(struct zone *zone, int order); | |||
333 | int zone_watermark_ok(struct zone *z, int order, unsigned long mark, | 333 | int zone_watermark_ok(struct zone *z, int order, unsigned long mark, |
334 | int classzone_idx, int alloc_flags); | 334 | int classzone_idx, int alloc_flags); |
335 | 335 | ||
336 | extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn, | ||
337 | unsigned long size); | ||
338 | |||
336 | #ifdef CONFIG_HAVE_MEMORY_PRESENT | 339 | #ifdef CONFIG_HAVE_MEMORY_PRESENT |
337 | void memory_present(int nid, unsigned long start, unsigned long end); | 340 | void memory_present(int nid, unsigned long start, unsigned long end); |
338 | #else | 341 | #else |