diff options
author | Wei Yang <richard.weiyang@gmail.com> | 2018-04-10 19:29:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 13:28:31 -0400 |
commit | bc8755ba66325cb5874eef81d935e91c331d0b1d (patch) | |
tree | 6f7d4cdc25031e9db54d1bde4211cfa333ee7d7f /drivers/base/memory.c | |
parent | 09a913a7a947fb6f624379e9da22670994942b85 (diff) |
mm: check __highest_present_section_nr directly in memory_dev_init()
__highest_present_section_nr is a more strict boundary than
NR_MEM_SECTIONS. So checking __highest_present_section_nr directly is
enough.
Link: http://lkml.kernel.org/r/20180330032044.21647-1-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base/memory.c')
-rw-r--r-- | drivers/base/memory.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 79fcd2bae96b..bffe8616bd55 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
@@ -837,11 +837,8 @@ int __init memory_dev_init(void) | |||
837 | * during boot and have been initialized | 837 | * during boot and have been initialized |
838 | */ | 838 | */ |
839 | mutex_lock(&mem_sysfs_mutex); | 839 | mutex_lock(&mem_sysfs_mutex); |
840 | for (i = 0; i < NR_MEM_SECTIONS; i += sections_per_block) { | 840 | for (i = 0; i <= __highest_present_section_nr; |
841 | /* Don't iterate over sections we know are !present: */ | 841 | i += sections_per_block) { |
842 | if (i > __highest_present_section_nr) | ||
843 | break; | ||
844 | |||
845 | err = add_memory_block(i); | 842 | err = add_memory_block(i); |
846 | if (!ret) | 843 | if (!ret) |
847 | ret = err; | 844 | ret = err; |