]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: Only include mmzone.h when CONFIG_NEED_MULTIPLE_NODES=y
authorPaul Burton <paul.burton@mips.com>
Thu, 22 Nov 2018 03:47:57 +0000 (19:47 -0800)
committerPaul Burton <paul.burton@mips.com>
Thu, 22 Nov 2018 03:54:59 +0000 (19:54 -0800)
commit59882aa0ab227a545d672b3bef46c4a8db913483
tree73ba766ada25117b2e18e7715aa88e2008a88966
parent64250fdd3a310aa45bd1994fabaaf64cfadc86c3
MIPS: Only include mmzone.h when CONFIG_NEED_MULTIPLE_NODES=y

MIPS' asm/mmzone.h includes the machine/platform mmzone.h
unconditionally, but since commit ec1f077c938f ("MIPS: c-r4k: Add
r4k_blast_scache_node for Loongson-3") is included by asm/rk4cache.h for
all r4k-style configs regardless of CONFIG_NEED_MULTIPLE_NODES.

This is problematic when CONFIG_NEED_MULTIPLE_NODES=n because both the
loongson3 & ip27 mmzone.h headers unconditionally define the NODE_DATA
preprocessor macro which is aready defined by linux/mmzone.h, resulting
in the following build error:

  In file included from ./arch/mips/include/asm/mmzone.h:10,
                   from ./arch/mips/include/asm/r4kcache.h:23,
                   from arch/mips/mm/c-r4k.c:33:
  ./arch/mips/include/asm/mach-loongson64/mmzone.h:48: error: "NODE_DATA" redefined [-Werror]
   #define NODE_DATA(n)  (&__node_data[(n)]->pglist)

  In file included from ./include/linux/topology.h:32,
                   from ./include/linux/irq.h:19,
                   from ./include/asm-generic/hardirq.h:13,
                   from ./arch/mips/include/asm/hardirq.h:16,
                   from ./include/linux/hardirq.h:9,
                   from arch/mips/mm/c-r4k.c:11:
  ./include/linux/mmzone.h:907: note: this is the location of the previous definition
   #define NODE_DATA(nid)  (&contig_page_data)

Resolve this by only including the machine mmzone.h when
CONFIG_NEED_MULTIPLE_NODES=y, which also removes the need for the empty
mach-generic version of the header which we delete.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Fixes: ec1f077c938f ("MIPS: c-r4k: Add r4k_blast_scache_node for Loongson-3")
arch/mips/include/asm/mach-generic/mmzone.h [deleted file]
arch/mips/include/asm/mmzone.h