Commit c558784fa9e65363ed32cf6ff137c89bc8b54f81
Committed by
Linus Torvalds
1 parent
de49850725
Exists in
master
and in
13 other branches
include/linux/mm.h: remove ifdef condition
The ifdef conditions in include/linux/mm.h presents three cases: - !defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) && !defined(CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID) There is no actual definition of function but include/linux/mm.h has a static inline stub defined. - defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) && !defined(CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID) linux/mm.h does not define a prototype, but mm/page_alloc.c defines the function. Hence, compiler reports the following warning: mm/page_alloc.c:4300:15: warning: no previous prototype for `__early_pfn_to_nid' [-Wmissing-prototypes] - defined(CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID) The architecture defines the function, and linux/mm.h has a prototype. Thus, join the conditions of Case 2 and 3 ie eliminate the ifdef condition of CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID to eliminate the missing prototype warning from file mm/page_alloc.c. Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Reviewed-by: Rik van Riel <riel@redhat.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>
Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff
include/linux/mm.h
... | ... | @@ -1666,10 +1666,8 @@ |
1666 | 1666 | #else |
1667 | 1667 | /* please see mm/page_alloc.c */ |
1668 | 1668 | extern int __meminit early_pfn_to_nid(unsigned long pfn); |
1669 | -#ifdef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID | |
1670 | 1669 | /* there is a per-arch backend function. */ |
1671 | 1670 | extern int __meminit __early_pfn_to_nid(unsigned long pfn); |
1672 | -#endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */ | |
1673 | 1671 | #endif |
1674 | 1672 | |
1675 | 1673 | extern void set_dma_reserve(unsigned long new_dma_reserve); |