Commit d8fc16a8 authored Mar 08, 2013 by Hugh Dickins Committed by Linus Torvalds Mar 08, 2013

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>

parent a40e7cf8

mm/ksm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -489,7 +489,7 @@ out: page = NULL;
		*/
		static inline int get_kpfn_nid(unsigned long kpfn)
		{
		return ksm_merge_across_nodes ? 0 : pfn_to_nid(kpfn);
		return ksm_merge_across_nodes ? 0 : NUMA(pfn_to_nid(kpfn));
		}

		static void remove_node_from_stable_tree(struct stable_node *stable_node)

Admin message