diff options
-rw-r--r-- | mm/memory_hotplug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b93c88125766..6b6362819be2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -941,15 +941,15 @@ static int online_pages_range(unsigned long start_pfn, unsigned long nr_pages, | |||
941 | * When CONFIG_MOVABLE_NODE, we permit onlining of a node which doesn't have | 941 | * When CONFIG_MOVABLE_NODE, we permit onlining of a node which doesn't have |
942 | * normal memory. | 942 | * normal memory. |
943 | */ | 943 | */ |
944 | static bool can_online_high_movable(struct zone *zone) | 944 | static bool can_online_high_movable(int nid) |
945 | { | 945 | { |
946 | return true; | 946 | return true; |
947 | } | 947 | } |
948 | #else /* CONFIG_MOVABLE_NODE */ | 948 | #else /* CONFIG_MOVABLE_NODE */ |
949 | /* ensure every online node has NORMAL memory */ | 949 | /* ensure every online node has NORMAL memory */ |
950 | static bool can_online_high_movable(struct zone *zone) | 950 | static bool can_online_high_movable(int nid) |
951 | { | 951 | { |
952 | return node_state(zone_to_nid(zone), N_NORMAL_MEMORY); | 952 | return node_state(nid, N_NORMAL_MEMORY); |
953 | } | 953 | } |
954 | #endif /* CONFIG_MOVABLE_NODE */ | 954 | #endif /* CONFIG_MOVABLE_NODE */ |
955 | 955 | ||
@@ -1083,7 +1083,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ | |||
1083 | 1083 | ||
1084 | if ((zone_idx(zone) > ZONE_NORMAL || | 1084 | if ((zone_idx(zone) > ZONE_NORMAL || |
1085 | online_type == MMOP_ONLINE_MOVABLE) && | 1085 | online_type == MMOP_ONLINE_MOVABLE) && |
1086 | !can_online_high_movable(zone)) | 1086 | !can_online_high_movable(pfn_to_nid(pfn))) |
1087 | return -EINVAL; | 1087 | return -EINVAL; |
1088 | 1088 | ||
1089 | if (online_type == MMOP_ONLINE_KERNEL) { | 1089 | if (online_type == MMOP_ONLINE_KERNEL) { |