> From: Rafael J. Wysocki [mailto:rjw@xxxxxxxxxxxxx] > Sent: Friday, December 06, 2013 6:37 AM > > On Thursday, December 05, 2013 07:26:37 PM Andy Shevchenko wrote: > > When build kernel with make W=1 we get the following compiler error. > > > > In file included from drivers/sfi/sfi_acpi.c:66:0: > > include/linux/sfi_acpi.h: In function ‘acpi_sfi_table_parse’: > > include/linux/sfi_acpi.h:72:2: error: implicit declaration of function ‘acpi_table_parse’ [-Werror=implicit-function-declaration] > > if (!acpi_table_parse(signature, handler)) > > ^ > > cc1: some warnings being treated as errors > > > > The patch changes acpi/acpi.h inclusion to linux/acpi.h. > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> > > OK > > Lv, I'm dropping your patch cleaning up the inclusions, please sort that thing > out entirely for the next cycle. No, I think Andy's patch is wrong. This warning is existing before merging my fixes. Either we fix this warning or leave it as is. To fix it, you need to add 1 line in sfi_acpi.h rather than change the line. Let me post a fix for this. Thanks -Lv > > Thanks! > > > --- > > drivers/sfi/sfi_acpi.c | 2 +- > > include/linux/sfi_acpi.h | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c > > index 0c9f419..d4dfcbe 100644 > > --- a/drivers/sfi/sfi_acpi.c > > +++ b/drivers/sfi/sfi_acpi.c > > @@ -60,7 +60,7 @@ > > #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt > > > > #include <linux/kernel.h> > > -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ > > +#include <linux/acpi.h> > > > > #include <linux/sfi.h> > > #include <linux/sfi_acpi.h> > > diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h > > index 2cfcb79..c9cab82 100644 > > --- a/include/linux/sfi_acpi.h > > +++ b/include/linux/sfi_acpi.h > > @@ -60,7 +60,7 @@ > > #define _LINUX_SFI_ACPI_H > > > > #ifdef CONFIG_SFI > > -#include <acpi/acpi.h> /* FIXME: inclusion should be removed */ > > +#include <linux/acpi.h> > > > > extern int sfi_acpi_table_parse(char *signature, char *oem_id, > > char *oem_table_id, > > > -- > I speak only for myself. > Rafael J. Wysocki, Intel Open Source Technology Center. ��.n��������+%������w��{.n�����{�����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
