Re: [PATCH v2 5/7] ACPI/SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions.

["Rafael J. Wysocki" <rjw@rjwysocki.net>]

On Monday, July 07, 2014 12:17:28 PM Lv Zheng wrote:
> This patch removes <acpi/acpi.h> inclusions from <linux/sfi_acpi.h> as
> <linux/acpi.h> has already included it for CONFIG_ACPI=n builds.

So are patches [1-4/5] only needed to fix this particular issue?

> Cc: Len Brown <lenb@kernel.org>
> Cc: sfi-devel@simplefirmware.org
> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
> ---
>  include/linux/sfi_acpi.h |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
> index 4723bbf..a6e555c 100644
> --- a/include/linux/sfi_acpi.h
> +++ b/include/linux/sfi_acpi.h
> @@ -63,8 +63,6 @@
>  #include <linux/sfi.h>
>  
>  #ifdef CONFIG_SFI
> -#include <acpi/acpi.h>	/* FIXME: inclusion should be removed */
> -
>  extern int sfi_acpi_table_parse(char *signature, char *oem_id,
>  				char *oem_table_id,
>  				int (*handler)(struct acpi_table_header *));
> @@ -78,7 +76,6 @@ static inline int __init acpi_sfi_table_parse(char *signature,
>  	return sfi_acpi_table_parse(signature, NULL, NULL, handler);
>  }
>  #else /* !CONFIG_SFI */
> -
>  static inline int sfi_acpi_table_parse(char *signature, char *oem_id,
>  				char *oem_table_id,
>  				int (*handler)(struct acpi_table_header *))
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.