|
@@ -3871,18 +3871,29 @@ static int __build_all_zonelists(void *data)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static noinline void __init
|
|
|
+build_all_zonelists_init(void)
|
|
|
+{
|
|
|
+ __build_all_zonelists(NULL);
|
|
|
+ mminit_verify_zonelist();
|
|
|
+ cpuset_init_current_mems_allowed();
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Called with zonelists_mutex held always
|
|
|
* unless system_state == SYSTEM_BOOTING.
|
|
|
+ *
|
|
|
+ * __ref due to (1) call of __meminit annotated setup_zone_pageset
|
|
|
+ * [we're only called with non-NULL zone through __meminit paths] and
|
|
|
+ * (2) call of __init annotated helper build_all_zonelists_init
|
|
|
+ * [protected by SYSTEM_BOOTING].
|
|
|
*/
|
|
|
void __ref build_all_zonelists(pg_data_t *pgdat, struct zone *zone)
|
|
|
{
|
|
|
set_zonelist_order();
|
|
|
|
|
|
if (system_state == SYSTEM_BOOTING) {
|
|
|
- __build_all_zonelists(NULL);
|
|
|
- mminit_verify_zonelist();
|
|
|
- cpuset_init_current_mems_allowed();
|
|
|
+ build_all_zonelists_init();
|
|
|
} else {
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
|
if (zone)
|