Re: [PATCH v2 1/5] ACPICA: OSL: Add direct inclusion of extra header.

[Rafael J. Wysocki]

On Wednesday, April 23, 2014 02:53:52 PM Lv Zheng wrote:
> This is a linuxized result of an ACPICA commit to upgrade the extra
> header mechanism.
> 
> This patch enhances the extra header solution to allow Linux to use
> ACPI_USE_NATIVE_INTERFACE_HEADER and the file name can be automatically
> replaced during ACPICA release process. Using this way, the rest of the
> ACPICA users needn't know the name of the extra header file. Lv Zheng.
> 
> Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx>
> ---
>  include/acpi/acpi.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h
> index ca0cb60..682398b 100644
> --- a/include/acpi/acpi.h
> +++ b/include/acpi/acpi.h
> @@ -62,8 +62,8 @@
>  #include <acpi/acrestyp.h>		/* Resource Descriptor structs */
>  #include <acpi/acpiosxf.h>		/* OSL interfaces (ACPICA-to-OS) */
>  #include <acpi/acpixf.h>		/* ACPI core subsystem external interfaces */
> -#ifdef ACPI_NATIVE_INTERFACE_HEADER
> -#include ACPI_NATIVE_INTERFACE_HEADER
> +#ifdef ACPI_USE_NATIVE_INTERFACE_HEADER
> +#include <acpi/acpi_opt.h>
>  #endif
>  
>  #endif				/* __ACPI_H__ */

Well, I still think there's a better way.

Introduce <acpi/platform/acenvex.h> into ACPICA and put this into it:

#if defined(_LINUX) || defined(__linux__)
#include <acpi/platform/aclinuxex.h>

#endif

and then move stuff you want in acpi/acpi_opt.h into acpi/platform/aclinuxex.h.

Then, you'll have in acpi.h:

#include <acpi/acrestyp.h>		/* Resource Descriptor structs */
#include <acpi/acpiosxf.h>		/* OSL interfaces (ACPICA-to-OS) */
#include <acpi/acpixf.h>		/* ACPI core subsystem external interfaces */
#include <acpi/platform/acenvex.h>	/* Extra environment-specific items */


That should work I suppose, shouldn't it?


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/