The patch titled
Subject: hexagon: fix build error caused by include file order
has been removed from the -mm tree. Its filename was
mm-memcontrol-per-lruvec-stats-infrastructure-fix-5.patch
This patch was dropped because it was folded into mm-memcontrol-per-lruvec-stats-infrastructure.patch
------------------------------------------------------
From: Guenter Roeck <linux@xxxxxxxxxxxx>
Subject: hexagon: fix build error caused by include file order
hexagon builds fail with the following error message.
In file included from ./include/linux/memcontrol.h:30:0,
from ./include/linux/swap.h:8,
from ./arch/hexagon/include/asm/pgtable.h:27,
from ./include/linux/mm.h:70,
from arch/hexagon/kernel/asm-offsets.c:28:
./include/linux/vmstat.h: In function '__inc_zone_page_state':
./include/linux/vmstat.h:294:2: error:
implicit declaration of function 'page_zone'
Drop unnecessary includes from header files and add missing
includes to source files to fix the problem.
Fixes: fb6646f52c45 ("mm: memcontrol: per-lruvec stats infrastructure")
Link: http://lkml.kernel.org/r/20170617153721.GA4382@xxxxxxxxxxxx
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/hexagon/include/asm/pgtable.h | 1 -
arch/hexagon/kernel/asm-offsets.c | 1 -
arch/hexagon/mm/vm_tlb.c | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
diff -puN arch/hexagon/include/asm/pgtable.h~mm-memcontrol-per-lruvec-stats-infrastructure-fix-5 arch/hexagon/include/asm/pgtable.h
--- a/arch/hexagon/include/asm/pgtable.h~mm-memcontrol-per-lruvec-stats-infrastructure-fix-5
+++ a/arch/hexagon/include/asm/pgtable.h
@@ -24,7 +24,6 @@
/*
* Page table definitions for Qualcomm Hexagon processor.
*/
-#include <linux/swap.h>
#include <asm/page.h>
#define __ARCH_USE_5LEVEL_HACK
#include <asm-generic/pgtable-nopmd.h>
diff -puN arch/hexagon/kernel/asm-offsets.c~mm-memcontrol-per-lruvec-stats-infrastructure-fix-5 arch/hexagon/kernel/asm-offsets.c
--- a/arch/hexagon/kernel/asm-offsets.c~mm-memcontrol-per-lruvec-stats-infrastructure-fix-5
+++ a/arch/hexagon/kernel/asm-offsets.c
@@ -25,7 +25,6 @@
#include <linux/compat.h>
#include <linux/types.h>
#include <linux/sched.h>
-#include <linux/mm.h>
#include <linux/interrupt.h>
#include <linux/kbuild.h>
#include <asm/ptrace.h>
diff -puN arch/hexagon/mm/vm_tlb.c~mm-memcontrol-per-lruvec-stats-infrastructure-fix-5 arch/hexagon/mm/vm_tlb.c
--- a/arch/hexagon/mm/vm_tlb.c~mm-memcontrol-per-lruvec-stats-infrastructure-fix-5
+++ a/arch/hexagon/mm/vm_tlb.c
@@ -24,6 +24,7 @@
* be instantiated for it, differently from a native build.
*/
#include <linux/mm.h>
+#include <linux/sched.h>
#include <asm/page.h>
#include <asm/hexagon_vm.h>
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxx are
mm-memcontrol-per-lruvec-stats-infrastructure.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
