Hi, Lee > From: Lee Jones [mailto:lee.jones@xxxxxxxxxx] > Sent: Wednesday, June 04, 2014 8:52 PM > To: Rafael J. Wysocki > > On Wed, 04 Jun 2014, Rafael J. Wysocki wrote: > > > On Wednesday, June 04, 2014 01:09:50 PM Lee Jones wrote: > > > Any drivers which support ACPI and Device Tree probing need to include > > > both respective header files. Without this patch, if a driver is being > > > used on a platform which does not support ACPI and subsequently does not > > > have the config option enabled, but includes linux/acpi.h the build > > > breaks with: > > > > > > In file included from ../include/acpi/platform/acenv.h:150:0, > > > from ../include/acpi/acpi.h:56, > > > from ../include/linux/match.h:2, > > > from ../drivers/i2c/i2c-core.c:43: > > > ../include/acpi/platform/aclinux.h:73:23: > > > fatal error: asm/acenv.h: No such file or directory > > > #include <asm/acenv.h> > > > ^ Note that: In our tree: <asm/acenv.h> is only included by <acpi/acpi.h>. And <acpi/acpi.h> is only included by 1. <linux/acpi.h> when CONFIG_ACPI enabled 2. <linux/sfi_acpi.h> - this is x86 specific, we'll clean it up by implementing stubs for all ACPI external interfaces. So there is no case we need to exclude <asm/acenv.h> when CONFIG_ACPI is not enabled. I cannot find linux/match.h here. If <linux/match.h> want to include ACPI features, it shouldn't include <acpi/acpi.h>, but should include <linux/acpi.h>. Please refer to: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=8b48463f And stop including <acpi/acpi.h> directly in any cases. Thanks and best regards -Lv > > > > Which kernel does this happen with? > > a0a962d (tag: refs/tags/next-20140602, refs/remotes/next/master) > Add linux-next specific files for 20140602 > > > > Cc: Lv Zheng <lv.zheng@xxxxxxxxx> > > > Cc: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > > > Cc: linux-acpi@xxxxxxxxxxxxxxx > > > Cc: devel@xxxxxxxxxx > > > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> > > > --- > > > include/acpi/platform/aclinux.h | 5 +++-- > > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > > > diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h > > > index cd1f052..fdf7663 100644 > > > --- a/include/acpi/platform/aclinux.h > > > +++ b/include/acpi/platform/aclinux.h > > > @@ -70,9 +70,10 @@ > > > #ifdef EXPORT_ACPI_INTERFACES > > > #include <linux/export.h> > > > #endif > > > -#include <asm/acenv.h> > > > > > > -#ifndef CONFIG_ACPI > > > +#ifdef CONFIG_ACPI > > > +#include <asm/acenv.h> > > > +#else > > > > > > /* External globals for __KERNEL__, stubs is needed */ > > > > > > > > > > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog ��.n��������+%������w��{.n����z�{��ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
