diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 14:52:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 14:52:52 -0400 |
commit | 08acd4f8af42affd8cbed81cc1b69fa12ddb213f (patch) | |
tree | 988d15db6233b20db6a500cd5f590c6d2041462d /include/acpi/acglobal.h | |
parent | ccf2779544eecfcc5447e2028d1029b6d4ff7bb6 (diff) | |
parent | 008238b54ac2350babf195084ecedbcf7851a202 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits)
ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
acpi: fix section mismatch warning in pnpacpi
intel_menlo: fix build warning
ACPI: Cleanup: Remove unneeded, multiple local dummy variables
ACPI: video - fix permissions on some proc entries
ACPI: video - properly handle errors when registering proc elements
ACPI: video - do not store invalid entries in attached_array list
ACPI: re-name acpi_pm_ops to acpi_suspend_ops
ACER_WMI/ASUS_LAPTOP: fix build bug
thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
ACPI: check a return value correctly in acpi_power_get_context()
#if 0 acpi/bay.c:eject_removable_drive()
eeepc-laptop: add hwmon fan control
eeepc-laptop: add backlight
eeepc-laptop: add base driver
ACPI: thinkpad-acpi: bump up version to 0.20
ACPI: thinkpad-acpi: fix selects in Kconfig
ACPI: thinkpad-acpi: use a private workqueue
ACPI: thinkpad-acpi: fluff really minor fix
ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
...
Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.
Diffstat (limited to 'include/acpi/acglobal.h')
-rw-r--r-- | include/acpi/acglobal.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 47a1fd8f2d8a..74ad971241db 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
@@ -5,7 +5,7 @@ | |||
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2007, R. Byron Moore | 8 | * Copyright (C) 2000 - 2008, Intel Corp. |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -170,10 +170,14 @@ ACPI_EXTERN u8 acpi_gbl_integer_nybble_width; | |||
170 | ACPI_EXTERN struct acpi_mutex_info acpi_gbl_mutex_info[ACPI_NUM_MUTEX]; | 170 | ACPI_EXTERN struct acpi_mutex_info acpi_gbl_mutex_info[ACPI_NUM_MUTEX]; |
171 | 171 | ||
172 | /* | 172 | /* |
173 | * Global lock semaphore works in conjunction with the actual HW global lock | 173 | * Global lock mutex is an actual AML mutex object |
174 | * Global lock semaphore works in conjunction with the HW global lock | ||
174 | */ | 175 | */ |
175 | ACPI_EXTERN acpi_mutex acpi_gbl_global_lock_mutex; | 176 | ACPI_EXTERN union acpi_operand_object *acpi_gbl_global_lock_mutex; |
176 | ACPI_EXTERN acpi_semaphore acpi_gbl_global_lock_semaphore; | 177 | ACPI_EXTERN acpi_semaphore acpi_gbl_global_lock_semaphore; |
178 | ACPI_EXTERN u16 acpi_gbl_global_lock_handle; | ||
179 | ACPI_EXTERN u8 acpi_gbl_global_lock_acquired; | ||
180 | ACPI_EXTERN u8 acpi_gbl_global_lock_present; | ||
177 | 181 | ||
178 | /* | 182 | /* |
179 | * Spinlocks are used for interfaces that can be possibly called at | 183 | * Spinlocks are used for interfaces that can be possibly called at |
@@ -213,27 +217,33 @@ ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_device_notify; | |||
213 | ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_system_notify; | 217 | ACPI_EXTERN struct acpi_object_notify_handler acpi_gbl_system_notify; |
214 | ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler; | 218 | ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler; |
215 | ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler; | 219 | ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler; |
220 | ACPI_EXTERN acpi_tbl_handler acpi_gbl_table_handler; | ||
221 | ACPI_EXTERN void *acpi_gbl_table_handler_context; | ||
216 | ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk; | 222 | ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk; |
217 | 223 | ||
224 | /* Owner ID support */ | ||
225 | |||
226 | ACPI_EXTERN u32 acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS]; | ||
227 | ACPI_EXTERN u8 acpi_gbl_last_owner_id_index; | ||
228 | ACPI_EXTERN u8 acpi_gbl_next_owner_id_offset; | ||
229 | |||
218 | /* Misc */ | 230 | /* Misc */ |
219 | 231 | ||
220 | ACPI_EXTERN u32 acpi_gbl_original_mode; | 232 | ACPI_EXTERN u32 acpi_gbl_original_mode; |
221 | ACPI_EXTERN u32 acpi_gbl_rsdp_original_location; | 233 | ACPI_EXTERN u32 acpi_gbl_rsdp_original_location; |
222 | ACPI_EXTERN u32 acpi_gbl_ns_lookup_count; | 234 | ACPI_EXTERN u32 acpi_gbl_ns_lookup_count; |
223 | ACPI_EXTERN u32 acpi_gbl_ps_find_count; | 235 | ACPI_EXTERN u32 acpi_gbl_ps_find_count; |
224 | ACPI_EXTERN u32 acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS]; | ||
225 | ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save; | 236 | ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save; |
226 | ACPI_EXTERN u16 acpi_gbl_global_lock_handle; | ||
227 | ACPI_EXTERN u8 acpi_gbl_last_owner_id_index; | ||
228 | ACPI_EXTERN u8 acpi_gbl_next_owner_id_offset; | ||
229 | ACPI_EXTERN u8 acpi_gbl_debugger_configuration; | 237 | ACPI_EXTERN u8 acpi_gbl_debugger_configuration; |
230 | ACPI_EXTERN u8 acpi_gbl_global_lock_acquired; | ||
231 | ACPI_EXTERN u8 acpi_gbl_step_to_next_call; | 238 | ACPI_EXTERN u8 acpi_gbl_step_to_next_call; |
232 | ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present; | 239 | ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present; |
233 | ACPI_EXTERN u8 acpi_gbl_global_lock_present; | ||
234 | ACPI_EXTERN u8 acpi_gbl_events_initialized; | 240 | ACPI_EXTERN u8 acpi_gbl_events_initialized; |
235 | ACPI_EXTERN u8 acpi_gbl_system_awake_and_running; | 241 | ACPI_EXTERN u8 acpi_gbl_system_awake_and_running; |
236 | 242 | ||
243 | #ifndef DEFINE_ACPI_GLOBALS | ||
244 | |||
245 | /* Other miscellaneous */ | ||
246 | |||
237 | extern u8 acpi_gbl_shutdown; | 247 | extern u8 acpi_gbl_shutdown; |
238 | extern u32 acpi_gbl_startup_flags; | 248 | extern u32 acpi_gbl_startup_flags; |
239 | extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT]; | 249 | extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT]; |
@@ -241,6 +251,8 @@ extern const char *acpi_gbl_highest_dstate_names[4]; | |||
241 | extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES]; | 251 | extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES]; |
242 | extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS]; | 252 | extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS]; |
243 | 253 | ||
254 | #endif | ||
255 | |||
244 | /* Exception codes */ | 256 | /* Exception codes */ |
245 | 257 | ||
246 | extern char const *acpi_gbl_exception_names_env[]; | 258 | extern char const *acpi_gbl_exception_names_env[]; |
@@ -255,8 +267,6 @@ extern char const *acpi_gbl_exception_names_ctrl[]; | |||
255 | * | 267 | * |
256 | ****************************************************************************/ | 268 | ****************************************************************************/ |
257 | 269 | ||
258 | #define NUM_NS_TYPES ACPI_TYPE_INVALID+1 | ||
259 | |||
260 | #if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) | 270 | #if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) |
261 | #define NUM_PREDEFINED_NAMES 10 | 271 | #define NUM_PREDEFINED_NAMES 10 |
262 | #else | 272 | #else |
@@ -267,7 +277,7 @@ ACPI_EXTERN struct acpi_namespace_node acpi_gbl_root_node_struct; | |||
267 | ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_root_node; | 277 | ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_root_node; |
268 | ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_fadt_gpe_device; | 278 | ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_fadt_gpe_device; |
269 | 279 | ||
270 | extern const u8 acpi_gbl_ns_properties[NUM_NS_TYPES]; | 280 | extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES]; |
271 | extern const struct acpi_predefined_names | 281 | extern const struct acpi_predefined_names |
272 | acpi_gbl_pre_defined_names[NUM_PREDEFINED_NAMES]; | 282 | acpi_gbl_pre_defined_names[NUM_PREDEFINED_NAMES]; |
273 | 283 | ||
@@ -275,8 +285,8 @@ extern const struct acpi_predefined_names | |||
275 | ACPI_EXTERN u32 acpi_gbl_current_node_count; | 285 | ACPI_EXTERN u32 acpi_gbl_current_node_count; |
276 | ACPI_EXTERN u32 acpi_gbl_current_node_size; | 286 | ACPI_EXTERN u32 acpi_gbl_current_node_size; |
277 | ACPI_EXTERN u32 acpi_gbl_max_concurrent_node_count; | 287 | ACPI_EXTERN u32 acpi_gbl_max_concurrent_node_count; |
278 | ACPI_EXTERN acpi_size acpi_gbl_entry_stack_pointer; | 288 | ACPI_EXTERN acpi_size *acpi_gbl_entry_stack_pointer; |
279 | ACPI_EXTERN acpi_size acpi_gbl_lowest_stack_pointer; | 289 | ACPI_EXTERN acpi_size *acpi_gbl_lowest_stack_pointer; |
280 | ACPI_EXTERN u32 acpi_gbl_deepest_nesting; | 290 | ACPI_EXTERN u32 acpi_gbl_deepest_nesting; |
281 | #endif | 291 | #endif |
282 | 292 | ||