Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d334c823 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion. 



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: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent daba25d6

arch/ia64/include/asm/acenv.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */

arch/x86/include/asm/acenv.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */

include/acpi/platform/aclinux.h

+2 −0
Original line number Diff line number Diff line
@@ -70,7 +70,9 @@ 
#ifdef EXPORT_ACPI_INTERFACES

#include <linux/export.h>

#endif

#ifdef CONFIG_ACPI

#include <asm/acenv.h>

#endif



#ifndef CONFIG_ACPI