From: Guenter Roeck <linux@roeck-us.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
Guenter Roeck <private@roeck-us.net>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: hexagon: build error in -next due to 'mm: memcontrol: per-lruvec stats infrastructure'
Date: Sat, 17 Jun 2017 08:40:39 -0700 [thread overview]
Message-ID: <20170617154039.GA4593@roeck-us.net> (raw)
[resending; somehow Andrew got lost in my first reply]
On Fri, Jun 16, 2017 at 01:37:21PM -0700, Andrew Morton wrote:
> On Fri, 16 Jun 2017 16:15:23 -0400 Johannes Weiner <hannes@cmpxchg.org> wrote:
>
> > In any case, memcontrol.h doesn't/shouldn't need hardirq.h. When that
> > include is removed, the below patch compiles on: x86 allno, x86_64
> > allno, and my regular x86_64 config:
> >
> > ---
> > Subject: mm-memcontrol-per-lruvec-stats-infrastructure-fix-4
>
> Did you try x86_64 allmodconfig? I'm getting a mess:
>
> In file included from ./include/linux/mm.h:1032,
> from ./include/linux/highmem.h:7,
> from ./include/linux/bio.h:21,
> from ./include/linux/writeback.h:205,
> from ./include/linux/memcontrol.h:28,
> from ./include/linux/swap.h:8,
> from ./include/linux/suspend.h:4,
> from arch/x86/kernel/asm-offsets.c:12:
> ./include/linux/vmstat.h: In function 'lruvec_page_state':
> ./include/linux/vmstat.h:362: error: implicit declaration of function 'mem_cgroup_disabled'
> ./include/linux/vmstat.h:365: error: dereferencing pointer to incomplete type
> ./include/linux/vmstat.h:365: error: type defaults to 'int' in declaration of 'type name'
> ...
>
> Presumably because we have memcontrol.h indirectly including mm.h which
> includes vmstat.h (from a stupid place) and with this patch we have
> vmstat.h including memcontrol.h.
>
How about the following ? Seems to be less invasive, and it fixes the
immediate problem.
Guenter
---
>From 3aa278a36b5f71ff64b28e0cea05182fbcaa72e6 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Sat, 17 Jun 2017 08:15:57 -0700
Subject: [PATCH] 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.
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Fixes: fb6646f52c45 ("mm: memcontrol: per-lruvec stats infrastructure")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
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 --git a/arch/hexagon/include/asm/pgtable.h b/arch/hexagon/include/asm/pgtable.h
index 24a9177fb897..aef02f7ca8aa 100644
--- a/arch/hexagon/include/asm/pgtable.h
+++ b/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 --git a/arch/hexagon/kernel/asm-offsets.c b/arch/hexagon/kernel/asm-offsets.c
index 308be68d4fb3..3980c0407aa1 100644
--- a/arch/hexagon/kernel/asm-offsets.c
+++ b/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 --git a/arch/hexagon/mm/vm_tlb.c b/arch/hexagon/mm/vm_tlb.c
index 9647d00cb761..b474065533ce 100644
--- a/arch/hexagon/mm/vm_tlb.c
+++ b/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>
--
2.7.4
next reply other threads:[~2017-06-17 15:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-17 15:40 Guenter Roeck [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-17 15:37 hexagon: build error in -next due to 'mm: memcontrol: per-lruvec stats infrastructure' Guenter Roeck
2017-06-19 15:47 ` Johannes Weiner
2017-06-14 7:26 Guenter Roeck
2017-06-16 18:49 ` Johannes Weiner
2017-06-16 19:14 ` Andrew Morton
2017-06-16 20:15 ` Johannes Weiner
2017-06-16 20:37 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170617154039.GA4593@roeck-us.net \
--to=linux@roeck-us.net \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=private@roeck-us.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).