Commit d8fc16a825eb7780db71268a8502fb3e6af95753
Committed by
Linus Torvalds
1 parent
a40e7cf8f0
Exists in
master
and in
20 other branches
ksm: fix m68k build: only NUMA needs pfn_to_nid
A CONFIG_DISCONTIGMEM=y m68k config gave mm/ksm.c: In function `get_kpfn_nid': mm/ksm.c:492: error: implicit declaration of function `pfn_to_nid' linux/mmzone.h declares it for CONFIG_SPARSEMEM and CONFIG_FLATMEM, but expects the arch's asm/mmzone.h to declare it for CONFIG_DISCONTIGMEM (see arch/mips/include/asm/mmzone.h for example). Or perhaps it is only expected when CONFIG_NUMA=y: too much of a maze, and m68k got away without it so far, so fix the build in mm/ksm.c. Signed-off-by: Hugh Dickins <hughd@google.com> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Petr Holasek <pholasek@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
mm/ksm.c
... | ... | @@ -489,7 +489,7 @@ |
489 | 489 | */ |
490 | 490 | static inline int get_kpfn_nid(unsigned long kpfn) |
491 | 491 | { |
492 | - return ksm_merge_across_nodes ? 0 : pfn_to_nid(kpfn); | |
492 | + return ksm_merge_across_nodes ? 0 : NUMA(pfn_to_nid(kpfn)); | |
493 | 493 | } |
494 | 494 | |
495 | 495 | static void remove_node_from_stable_tree(struct stable_node *stable_node) |