Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbdFSPrk (ORCPT ); Mon, 19 Jun 2017 11:47:40 -0400 Received: from gum.cmpxchg.org ([85.214.110.215]:45812 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbdFSPrh (ORCPT ); Mon, 19 Jun 2017 11:47:37 -0400 Date: Mon, 19 Jun 2017 11:47:17 -0400 From: Johannes Weiner To: Guenter Roeck Cc: Guenter Roeck , Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: hexagon: build error in -next due to 'mm: memcontrol: per-lruvec stats infrastructure' Message-ID: <20170619154717.GA32294@cmpxchg.org> References: <20170617153721.GA4382@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170617153721.GA4382@roeck-us.net> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2759 Lines: 64 On Sat, Jun 17, 2017 at 08:37:21AM -0700, Guenter Roeck wrote: > On Fri, Jun 16, 2017 at 01:37:21PM -0700, wrote: > > On Fri, 16 Jun 2017 16:15:23 -0400 Johannes Weiner 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 > 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 > Cc: Andrew Morton > Fixes: fb6646f52c45 ("mm: memcontrol: per-lruvec stats infrastructure") > Signed-off-by: Guenter Roeck If they're not needed, all the better. Thanks! Acked-by: Johannes Weiner