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

Commit 7e1c1a82 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-headers' 

* acpi-headers:
  ACPI: Add support to force header inclusion rules for <acpi/acpi.h>.
  ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions.
  ACPICA: Linux: Allow ACPICA inclusion for CONFIG_ACPI=n builds.
  ACPICA: Linux: Add support to exclude <asm/acenv.h> inclusion.
  ACPICA: Linux: Add stub implementation of ACPICA 64-bit mathematics.
  ACPICA: Linux: Add stub support for Linux specific variables and functions.
parents 92a18409 417b4a73

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 */

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for ACPICA Core interpreter

#



ccflags-y			:= -Os

ccflags-y			:= -Os -DBUILDING_ACPICA

ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT



# use acpi.o to put all files here into acpi.o modparam namespace

drivers/acpi/bus.c

+0 −3
Original line number Diff line number Diff line
@@ -477,9 +477,6 @@ static int __init acpi_bus_init_irq(void) 
	return 0;

}



u8 acpi_gbl_permanent_mmap;





void __init acpi_early_init(void)

{

	acpi_status status;

include/acpi/acpixf.h

+17 −11
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ 
#include <acpi/actbl.h>

#include <acpi/acbuffer.h>



extern u8 acpi_gbl_permanent_mmap;



/*****************************************************************************

 *

 * Macros used for ACPICA globals and configuration
@@ -889,17 +887,25 @@ ACPI_APP_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(1) 
/*

 * Divergences

 */

acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type);

ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);



ACPI_EXTERNAL_RETURN_STATUS(acpi_status

			    acpi_get_id(acpi_handle object,

					acpi_owner_id * out_type))



acpi_status acpi_unload_table_id(acpi_owner_id id);

ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table_id(acpi_owner_id id))



acpi_status

ACPI_EXTERNAL_RETURN_STATUS(acpi_status

			    acpi_get_table_with_size(acpi_string signature,

	       u32 instance, struct acpi_table_header **out_table,

	       acpi_size *tbl_size);

						     u32 instance,

						     struct acpi_table_header

						     **out_table,

						     acpi_size *tbl_size))



acpi_status

acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data,

		   void (*callback)(void *));

ACPI_EXTERNAL_RETURN_STATUS(acpi_status

			    acpi_get_data_full(acpi_handle object,

					       acpi_object_handler handler,

					       void **data,

					       void (*callback)(void *)))



#endif				/* __ACXFACE_H__ */