diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acconfig.h | 6 | ||||
-rw-r--r-- | include/acpi/acglobal.h | 5 | ||||
-rw-r--r-- | include/acpi/acmacros.h | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index 08eafece3eed..f48b9ee9a876 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h | |||
@@ -63,7 +63,7 @@ | |||
63 | 63 | ||
64 | /* Current ACPICA subsystem version in YYYYMMDD format */ | 64 | /* Current ACPICA subsystem version in YYYYMMDD format */ |
65 | 65 | ||
66 | #define ACPI_CA_VERSION 0x20051117 | 66 | #define ACPI_CA_VERSION 0x20051202 |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * OS name, used for the _OS object. The _OS object is essentially obsolete, | 69 | * OS name, used for the _OS object. The _OS object is essentially obsolete, |
@@ -110,6 +110,10 @@ | |||
110 | 110 | ||
111 | #define ACPI_SYSMEM_REGION_WINDOW_SIZE 4096 | 111 | #define ACPI_SYSMEM_REGION_WINDOW_SIZE 4096 |
112 | 112 | ||
113 | /* owner_id tracking. 8 entries allows for 255 owner_ids */ | ||
114 | |||
115 | #define ACPI_NUM_OWNERID_MASKS 8 | ||
116 | |||
113 | /****************************************************************************** | 117 | /****************************************************************************** |
114 | * | 118 | * |
115 | * ACPI Specification constants (Do not change unless the specification changes) | 119 | * ACPI Specification constants (Do not change unless the specification changes) |
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index bd344e51313b..3f37560c26ab 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
@@ -220,10 +220,11 @@ ACPI_EXTERN u32 acpi_gbl_original_mode; | |||
220 | ACPI_EXTERN u32 acpi_gbl_rsdp_original_location; | 220 | ACPI_EXTERN u32 acpi_gbl_rsdp_original_location; |
221 | ACPI_EXTERN u32 acpi_gbl_ns_lookup_count; | 221 | ACPI_EXTERN u32 acpi_gbl_ns_lookup_count; |
222 | ACPI_EXTERN u32 acpi_gbl_ps_find_count; | 222 | ACPI_EXTERN u32 acpi_gbl_ps_find_count; |
223 | ACPI_EXTERN u32 acpi_gbl_owner_id_mask; | 223 | ACPI_EXTERN u32 acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS]; |
224 | ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save; | 224 | ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save; |
225 | ACPI_EXTERN u16 acpi_gbl_global_lock_handle; | 225 | ACPI_EXTERN u16 acpi_gbl_global_lock_handle; |
226 | ACPI_EXTERN u8 acpi_gbl_last_owner_id; | 226 | ACPI_EXTERN u8 acpi_gbl_last_owner_id_index; |
227 | ACPI_EXTERN u8 acpi_gbl_next_owner_id_offset; | ||
227 | ACPI_EXTERN u8 acpi_gbl_debugger_configuration; | 228 | ACPI_EXTERN u8 acpi_gbl_debugger_configuration; |
228 | ACPI_EXTERN u8 acpi_gbl_global_lock_acquired; | 229 | ACPI_EXTERN u8 acpi_gbl_global_lock_acquired; |
229 | ACPI_EXTERN u8 acpi_gbl_step_to_next_call; | 230 | ACPI_EXTERN u8 acpi_gbl_step_to_next_call; |
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index 5b78ff4091b9..65a1a5c1a689 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h | |||
@@ -332,6 +332,10 @@ | |||
332 | #define ACPI_MUL_16(a) _ACPI_MUL(a,4) | 332 | #define ACPI_MUL_16(a) _ACPI_MUL(a,4) |
333 | #define ACPI_MOD_16(a) _ACPI_MOD(a,16) | 333 | #define ACPI_MOD_16(a) _ACPI_MOD(a,16) |
334 | 334 | ||
335 | #define ACPI_DIV_32(a) _ACPI_DIV(a,5) | ||
336 | #define ACPI_MUL_32(a) _ACPI_MUL(a,5) | ||
337 | #define ACPI_MOD_32(a) _ACPI_MOD(a,32) | ||
338 | |||
335 | /* | 339 | /* |
336 | * Rounding macros (Power of two boundaries only) | 340 | * Rounding macros (Power of two boundaries only) |
337 | */ | 341 | */ |