diff options
author | Pavel Tatashin <pasha.tatashin@oracle.com> | 2018-08-22 00:53:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 13:52:45 -0400 |
commit | 7cc2a9596d77e598a476ec7819046a453378d4a6 (patch) | |
tree | 50c7d497a53ad325de4c02848085067617eddaab /mm/internal.h | |
parent | c1093b746c0576ed81c4d568d1e39cab651d37e6 (diff) |
mm: remove __paginginit
__paginginit is the same thing as __meminit except for platforms without
sparsemem, there it is defined as __init.
Remove __paginginit and use __meminit. Use __ref in one single function
that merges __meminit and __init sections: setup_usemap().
Link: http://lkml.kernel.org/r/20180801122348.21588-4-osalvador@techadventures.net
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Pasha Tatashin <Pavel.Tatashin@microsoft.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/internal.h')
-rw-r--r-- | mm/internal.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mm/internal.h b/mm/internal.h index 9e3654d70289..dab088cb6937 100644 --- a/mm/internal.h +++ b/mm/internal.h | |||
@@ -389,18 +389,6 @@ static inline struct page *mem_map_next(struct page *iter, | |||
389 | return iter + 1; | 389 | return iter + 1; |
390 | } | 390 | } |
391 | 391 | ||
392 | /* | ||
393 | * FLATMEM and DISCONTIGMEM configurations use alloc_bootmem_node, | ||
394 | * so all functions starting at paging_init should be marked __init | ||
395 | * in those cases. SPARSEMEM, however, allows for memory hotplug, | ||
396 | * and alloc_bootmem_node is not used. | ||
397 | */ | ||
398 | #ifdef CONFIG_SPARSEMEM | ||
399 | #define __paginginit __meminit | ||
400 | #else | ||
401 | #define __paginginit __init | ||
402 | #endif | ||
403 | |||
404 | /* Memory initialisation debug and verification */ | 392 | /* Memory initialisation debug and verification */ |
405 | enum mminit_level { | 393 | enum mminit_level { |
406 | MMINIT_WARNING, | 394 | MMINIT_WARNING, |