lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 3/7] ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
    Date
    The forthcoming patch will make <acpi/acpi.h> to be visible to all kernel
    source code. Thus for the architectures that do not support ACPI and
    haven't implemented <asm/acenv.h>, we need to make it excluded.

    Signed-off-by: Lv Zheng <lv.zheng@intel.com>
    ---
    arch/ia64/include/asm/acenv.h | 4 ----
    arch/x86/include/asm/acenv.h | 4 ----
    include/acpi/platform/aclinux.h | 2 ++
    3 files changed, 2 insertions(+), 8 deletions(-)

    diff --git a/arch/ia64/include/asm/acenv.h b/arch/ia64/include/asm/acenv.h
    index 3f9eaee..35ff13a 100644
    --- a/arch/ia64/include/asm/acenv.h
    +++ b/arch/ia64/include/asm/acenv.h
    @@ -19,8 +19,6 @@

    /* Asm macros */

    -#ifdef CONFIG_ACPI
    -
    static inline int
    ia64_acpi_acquire_global_lock(unsigned int *lock)
    {
    @@ -51,6 +49,4 @@ ia64_acpi_release_global_lock(unsigned int *lock)
    #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
    ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))

    -#endif
    -
    #endif /* _ASM_IA64_ACENV_H */
    diff --git a/arch/x86/include/asm/acenv.h b/arch/x86/include/asm/acenv.h
    index 6687329..1b010a8 100644
    --- a/arch/x86/include/asm/acenv.h
    +++ b/arch/x86/include/asm/acenv.h
    @@ -18,8 +18,6 @@

    #define ACPI_FLUSH_CPU_CACHE() wbinvd()

    -#ifdef CONFIG_ACPI
    -
    int __acpi_acquire_global_lock(unsigned int *lock);
    int __acpi_release_global_lock(unsigned int *lock);

    @@ -44,6 +42,4 @@ int __acpi_release_global_lock(unsigned int *lock);
    : "=r"(n_hi), "=r"(n_lo) \
    : "0"(n_hi), "1"(n_lo))

    -#endif
    -
    #endif /* _ASM_X86_ACENV_H */
    diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
    index cd1f052..dfba354 100644
    --- a/include/acpi/platform/aclinux.h
    +++ b/include/acpi/platform/aclinux.h
    @@ -70,7 +70,9 @@
    #ifdef EXPORT_ACPI_INTERFACES
    #include <linux/export.h>
    #endif
    +#ifdef CONFIG_ACPI
    #include <asm/acenv.h>
    +#endif

    #ifndef CONFIG_ACPI

    --
    1.7.10


    \
     
     \ /
      Last update: 2014-07-19 19:41    [W:4.149 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site