diff options
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acdispat.h | 9 | ||||
-rw-r--r-- | include/acpi/acglobal.h | 2 | ||||
-rw-r--r-- | include/acpi/acinterp.h | 9 | ||||
-rw-r--r-- | include/acpi/aclocal.h | 2 | ||||
-rw-r--r-- | include/acpi/acmacros.h | 23 | ||||
-rw-r--r-- | include/acpi/acnamesp.h | 6 | ||||
-rw-r--r-- | include/acpi/acobject.h | 4 | ||||
-rw-r--r-- | include/acpi/acoutput.h | 4 | ||||
-rw-r--r-- | include/acpi/acpi_bus.h | 9 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 6 | ||||
-rw-r--r-- | include/acpi/acpi_numa.h | 12 | ||||
-rw-r--r-- | include/acpi/acpiosxf.h | 6 | ||||
-rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
-rw-r--r-- | include/acpi/actypes.h | 2 | ||||
-rw-r--r-- | include/acpi/acutils.h | 5 | ||||
-rw-r--r-- | include/acpi/platform/acenv.h | 2 | ||||
-rw-r--r-- | include/acpi/platform/aclinux.h | 24 | ||||
-rw-r--r-- | include/acpi/processor.h | 18 |
18 files changed, 93 insertions, 52 deletions
diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h index cb8d2868c8ac..7f690bb0f02f 100644 --- a/include/acpi/acdispat.h +++ b/include/acpi/acdispat.h | |||
@@ -290,12 +290,9 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state); | |||
290 | acpi_status | 290 | acpi_status |
291 | acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state); | 291 | acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state); |
292 | 292 | ||
293 | struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, | 293 | struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object |
294 | union acpi_parse_object | 294 | *origin, union acpi_operand_object |
295 | *origin, | 295 | *mth_desc, struct acpi_thread_state |
296 | union acpi_operand_object | ||
297 | *mth_desc, | ||
298 | struct acpi_thread_state | ||
299 | *thread); | 296 | *thread); |
300 | 297 | ||
301 | acpi_status | 298 | acpi_status |
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 24c3f05ab367..347a911d8237 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
@@ -319,7 +319,7 @@ ACPI_EXTERN struct acpi_fixed_event_handler | |||
319 | acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS]; | 319 | acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS]; |
320 | ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head; | 320 | ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head; |
321 | ACPI_EXTERN struct acpi_gpe_block_info | 321 | ACPI_EXTERN struct acpi_gpe_block_info |
322 | *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS]; | 322 | *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS]; |
323 | 323 | ||
324 | /***************************************************************************** | 324 | /***************************************************************************** |
325 | * | 325 | * |
diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h index 440983019993..ce7c9d653910 100644 --- a/include/acpi/acinterp.h +++ b/include/acpi/acinterp.h | |||
@@ -253,8 +253,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc, | |||
253 | 253 | ||
254 | void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread); | 254 | void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread); |
255 | 255 | ||
256 | void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc, | 256 | void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc); |
257 | struct acpi_thread_state *thread); | ||
258 | 257 | ||
259 | /* | 258 | /* |
260 | * exprep - ACPI AML execution - prep utilities | 259 | * exprep - ACPI AML execution - prep utilities |
@@ -446,10 +445,14 @@ acpi_ex_copy_integer_to_buffer_field(union acpi_operand_object *source_desc, | |||
446 | /* | 445 | /* |
447 | * exutils - interpreter/scanner utilities | 446 | * exutils - interpreter/scanner utilities |
448 | */ | 447 | */ |
449 | acpi_status acpi_ex_enter_interpreter(void); | 448 | void acpi_ex_enter_interpreter(void); |
450 | 449 | ||
451 | void acpi_ex_exit_interpreter(void); | 450 | void acpi_ex_exit_interpreter(void); |
452 | 451 | ||
452 | void acpi_ex_reacquire_interpreter(void); | ||
453 | |||
454 | void acpi_ex_relinquish_interpreter(void); | ||
455 | |||
453 | void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc); | 456 | void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc); |
454 | 457 | ||
455 | u8 acpi_ex_acquire_global_lock(u32 rule); | 458 | u8 acpi_ex_acquire_global_lock(u32 rule); |
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index 6f83ddbed3af..202cd4242ba1 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h | |||
@@ -630,7 +630,7 @@ ACPI_PARSE_COMMON}; | |||
630 | * and bytelists. | 630 | * and bytelists. |
631 | */ | 631 | */ |
632 | struct acpi_parse_obj_named { | 632 | struct acpi_parse_obj_named { |
633 | ACPI_PARSE_COMMON u8 * path; | 633 | ACPI_PARSE_COMMON u8 *path; |
634 | u8 *data; /* AML body or bytelist data */ | 634 | u8 *data; /* AML body or bytelist data */ |
635 | u32 length; /* AML length */ | 635 | u32 length; /* AML length */ |
636 | u32 name; /* 4-byte name or zero if no name */ | 636 | u32 name; /* 4-byte name or zero if no name */ |
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h index 8948a6461834..c22f6da6d372 100644 --- a/include/acpi/acmacros.h +++ b/include/acpi/acmacros.h | |||
@@ -486,6 +486,8 @@ | |||
486 | #define ACPI_FUNCTION_NAME(name) | 486 | #define ACPI_FUNCTION_NAME(name) |
487 | #endif | 487 | #endif |
488 | 488 | ||
489 | #ifdef DEBUG_FUNC_TRACE | ||
490 | |||
489 | #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \ | 491 | #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \ |
490 | acpi_ut_trace(ACPI_DEBUG_PARAMETERS) | 492 | acpi_ut_trace(ACPI_DEBUG_PARAMETERS) |
491 | #define ACPI_FUNCTION_TRACE_PTR(a,b) ACPI_FUNCTION_NAME(a) \ | 493 | #define ACPI_FUNCTION_TRACE_PTR(a,b) ACPI_FUNCTION_NAME(a) \ |
@@ -563,6 +565,27 @@ | |||
563 | 565 | ||
564 | #endif /* ACPI_SIMPLE_RETURN_MACROS */ | 566 | #endif /* ACPI_SIMPLE_RETURN_MACROS */ |
565 | 567 | ||
568 | #else /* !DEBUG_FUNC_TRACE */ | ||
569 | |||
570 | #define ACPI_FUNCTION_TRACE(a) | ||
571 | #define ACPI_FUNCTION_TRACE_PTR(a,b) | ||
572 | #define ACPI_FUNCTION_TRACE_U32(a,b) | ||
573 | #define ACPI_FUNCTION_TRACE_STR(a,b) | ||
574 | #define ACPI_FUNCTION_EXIT | ||
575 | #define ACPI_FUNCTION_STATUS_EXIT(s) | ||
576 | #define ACPI_FUNCTION_VALUE_EXIT(s) | ||
577 | #define ACPI_FUNCTION_TRACE(a) | ||
578 | #define ACPI_FUNCTION_ENTRY() | ||
579 | |||
580 | #define return_VOID return | ||
581 | #define return_ACPI_STATUS(s) return(s) | ||
582 | #define return_VALUE(s) return(s) | ||
583 | #define return_UINT8(s) return(s) | ||
584 | #define return_UINT32(s) return(s) | ||
585 | #define return_PTR(s) return(s) | ||
586 | |||
587 | #endif /* DEBUG_FUNC_TRACE */ | ||
588 | |||
566 | /* Conditional execution */ | 589 | /* Conditional execution */ |
567 | 590 | ||
568 | #define ACPI_DEBUG_EXEC(a) a | 591 | #define ACPI_DEBUG_EXEC(a) a |
diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h index 535b7e1c41bc..5ef38a6c8a61 100644 --- a/include/acpi/acnamesp.h +++ b/include/acpi/acnamesp.h | |||
@@ -100,10 +100,8 @@ acpi_ns_walk_namespace(acpi_object_type type, | |||
100 | acpi_walk_callback user_function, | 100 | acpi_walk_callback user_function, |
101 | void *context, void **return_value); | 101 | void *context, void **return_value); |
102 | 102 | ||
103 | struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, | 103 | struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node |
104 | struct acpi_namespace_node | 104 | *parent, struct acpi_namespace_node |
105 | *parent, | ||
106 | struct acpi_namespace_node | ||
107 | *child); | 105 | *child); |
108 | 106 | ||
109 | /* | 107 | /* |
diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h index 5206d61d74a6..7e1211a8b8fa 100644 --- a/include/acpi/acobject.h +++ b/include/acpi/acobject.h | |||
@@ -155,7 +155,7 @@ struct acpi_object_event { | |||
155 | struct acpi_object_mutex { | 155 | struct acpi_object_mutex { |
156 | ACPI_OBJECT_COMMON_HEADER u8 sync_level; /* 0-15, specified in Mutex() call */ | 156 | ACPI_OBJECT_COMMON_HEADER u8 sync_level; /* 0-15, specified in Mutex() call */ |
157 | u16 acquisition_depth; /* Allow multiple Acquires, same thread */ | 157 | u16 acquisition_depth; /* Allow multiple Acquires, same thread */ |
158 | acpi_thread_id owner_thread_id; /* Current owner of the mutex */ | 158 | struct acpi_thread_state *owner_thread; /* Current owner of the mutex */ |
159 | acpi_mutex os_mutex; /* Actual OS synchronization object */ | 159 | acpi_mutex os_mutex; /* Actual OS synchronization object */ |
160 | union acpi_operand_object *prev; /* Link for list of acquired mutexes */ | 160 | union acpi_operand_object *prev; /* Link for list of acquired mutexes */ |
161 | union acpi_operand_object *next; /* Link for list of acquired mutexes */ | 161 | union acpi_operand_object *next; /* Link for list of acquired mutexes */ |
@@ -216,7 +216,7 @@ struct acpi_object_processor { | |||
216 | /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */ | 216 | /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */ |
217 | u8 proc_id; | 217 | u8 proc_id; |
218 | u8 length; | 218 | u8 length; |
219 | ACPI_COMMON_NOTIFY_INFO acpi_io_address address; | 219 | ACPI_COMMON_NOTIFY_INFO acpi_io_address address; |
220 | }; | 220 | }; |
221 | 221 | ||
222 | struct acpi_object_thermal_zone { | 222 | struct acpi_object_thermal_zone { |
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 7812267b577f..c090a8b0bc99 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h | |||
@@ -178,8 +178,8 @@ | |||
178 | 178 | ||
179 | /* Defaults for debug_level, debug and normal */ | 179 | /* Defaults for debug_level, debug and normal */ |
180 | 180 | ||
181 | #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR | ACPI_LV_DEBUG_OBJECT) | 181 | #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR) |
182 | #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR | ACPI_LV_DEBUG_OBJECT) | 182 | #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR) |
183 | #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) | 183 | #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) |
184 | 184 | ||
185 | #endif /* __ACOUTPUT_H__ */ | 185 | #endif /* __ACOUTPUT_H__ */ |
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 9cfd5b1a48eb..c6fa5e023bc7 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -91,7 +91,8 @@ typedef int (*acpi_op_remove) (struct acpi_device * device, int type); | |||
91 | typedef int (*acpi_op_lock) (struct acpi_device * device, int type); | 91 | typedef int (*acpi_op_lock) (struct acpi_device * device, int type); |
92 | typedef int (*acpi_op_start) (struct acpi_device * device); | 92 | typedef int (*acpi_op_start) (struct acpi_device * device); |
93 | typedef int (*acpi_op_stop) (struct acpi_device * device, int type); | 93 | typedef int (*acpi_op_stop) (struct acpi_device * device, int type); |
94 | typedef int (*acpi_op_suspend) (struct acpi_device * device, pm_message_t state); | 94 | typedef int (*acpi_op_suspend) (struct acpi_device * device, |
95 | pm_message_t state); | ||
95 | typedef int (*acpi_op_resume) (struct acpi_device * device); | 96 | typedef int (*acpi_op_resume) (struct acpi_device * device); |
96 | typedef int (*acpi_op_scan) (struct acpi_device * device); | 97 | typedef int (*acpi_op_scan) (struct acpi_device * device); |
97 | typedef int (*acpi_op_bind) (struct acpi_device * device); | 98 | typedef int (*acpi_op_bind) (struct acpi_device * device); |
@@ -296,7 +297,7 @@ struct acpi_device { | |||
296 | void *driver_data; | 297 | void *driver_data; |
297 | struct device dev; | 298 | struct device dev; |
298 | struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */ | 299 | struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */ |
299 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ | 300 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ |
300 | }; | 301 | }; |
301 | 302 | ||
302 | #define acpi_driver_data(d) ((d)->driver_data) | 303 | #define acpi_driver_data(d) ((d)->driver_data) |
@@ -338,7 +339,7 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, | |||
338 | acpi_handle handle, int type); | 339 | acpi_handle handle, int type); |
339 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); | 340 | int acpi_bus_trim(struct acpi_device *start, int rmdevice); |
340 | int acpi_bus_start(struct acpi_device *device); | 341 | int acpi_bus_start(struct acpi_device *device); |
341 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd); | 342 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); |
342 | int acpi_match_ids(struct acpi_device *device, char *ids); | 343 | int acpi_match_ids(struct acpi_device *device, char *ids); |
343 | int acpi_create_dir(struct acpi_device *); | 344 | int acpi_create_dir(struct acpi_device *); |
344 | void acpi_remove_dir(struct acpi_device *); | 345 | void acpi_remove_dir(struct acpi_device *); |
@@ -363,6 +364,6 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer); | |||
363 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 364 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
364 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 365 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
365 | 366 | ||
366 | #endif /* CONFIG_ACPI */ | 367 | #endif /* CONFIG_ACPI */ |
367 | 368 | ||
368 | #endif /*__ACPI_BUS_H__*/ | 369 | #endif /*__ACPI_BUS_H__*/ |
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index f6275b0e66dd..553515912c0b 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -113,7 +113,8 @@ extern int is_dock_device(acpi_handle handle); | |||
113 | extern int register_dock_notifier(struct notifier_block *nb); | 113 | extern int register_dock_notifier(struct notifier_block *nb); |
114 | extern void unregister_dock_notifier(struct notifier_block *nb); | 114 | extern void unregister_dock_notifier(struct notifier_block *nb); |
115 | extern int register_hotplug_dock_device(acpi_handle handle, | 115 | extern int register_hotplug_dock_device(acpi_handle handle, |
116 | acpi_notify_handler handler, void *context); | 116 | acpi_notify_handler handler, |
117 | void *context); | ||
117 | extern void unregister_hotplug_dock_device(acpi_handle handle); | 118 | extern void unregister_hotplug_dock_device(acpi_handle handle); |
118 | #else | 119 | #else |
119 | static inline int is_dock_device(acpi_handle handle) | 120 | static inline int is_dock_device(acpi_handle handle) |
@@ -128,7 +129,8 @@ static inline void unregister_dock_notifier(struct notifier_block *nb) | |||
128 | { | 129 | { |
129 | } | 130 | } |
130 | static inline int register_hotplug_dock_device(acpi_handle handle, | 131 | static inline int register_hotplug_dock_device(acpi_handle handle, |
131 | acpi_notify_handler handler, void *context) | 132 | acpi_notify_handler handler, |
133 | void *context) | ||
132 | { | 134 | { |
133 | return -ENODEV; | 135 | return -ENODEV; |
134 | } | 136 | } |
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index 1049f2a0a6db..62c5ee4311da 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h | |||
@@ -8,15 +8,13 @@ | |||
8 | #if MAX_NUMNODES > 256 | 8 | #if MAX_NUMNODES > 256 |
9 | #define MAX_PXM_DOMAINS MAX_NUMNODES | 9 | #define MAX_PXM_DOMAINS MAX_NUMNODES |
10 | #else | 10 | #else |
11 | #define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */ | 11 | #define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */ |
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]; | 14 | extern int pxm_to_node(int); |
15 | extern int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]; | 15 | extern int node_to_pxm(int); |
16 | 16 | extern void __acpi_map_pxm_to_node(int, int); | |
17 | extern int __cpuinit pxm_to_node(int); | 17 | extern int acpi_map_pxm_to_node(int); |
18 | extern int __cpuinit node_to_pxm(int); | ||
19 | extern int __cpuinit acpi_map_pxm_to_node(int); | ||
20 | extern void __cpuinit acpi_unmap_pxm_to_node(int); | 18 | extern void __cpuinit acpi_unmap_pxm_to_node(int); |
21 | 19 | ||
22 | #endif /* CONFIG_ACPI_NUMA */ | 20 | #endif /* CONFIG_ACPI_NUMA */ |
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 2785058c82ab..ca882b8e7d10 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
@@ -78,7 +78,7 @@ struct acpi_signal_fatal_info { | |||
78 | /* | 78 | /* |
79 | * OSL Initialization and shutdown primitives | 79 | * OSL Initialization and shutdown primitives |
80 | */ | 80 | */ |
81 | acpi_status acpi_os_initialize(void); | 81 | acpi_status __initdata acpi_os_initialize(void); |
82 | 82 | ||
83 | acpi_status acpi_os_terminate(void); | 83 | acpi_status acpi_os_terminate(void); |
84 | 84 | ||
@@ -143,7 +143,8 @@ void acpi_os_release_mutex(acpi_mutex handle); | |||
143 | */ | 143 | */ |
144 | void *acpi_os_allocate(acpi_size size); | 144 | void *acpi_os_allocate(acpi_size size); |
145 | 145 | ||
146 | void __iomem *acpi_os_map_memory(acpi_physical_address where, acpi_native_uint length); | 146 | void __iomem *acpi_os_map_memory(acpi_physical_address where, |
147 | acpi_native_uint length); | ||
147 | 148 | ||
148 | void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size); | 149 | void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size); |
149 | 150 | ||
@@ -235,6 +236,7 @@ acpi_os_derive_pci_id(acpi_handle rhandle, | |||
235 | * Miscellaneous | 236 | * Miscellaneous |
236 | */ | 237 | */ |
237 | acpi_status acpi_os_validate_interface(char *interface); | 238 | acpi_status acpi_os_validate_interface(char *interface); |
239 | acpi_status acpi_osi_invalidate(char* interface); | ||
238 | 240 | ||
239 | acpi_status | 241 | acpi_status |
240 | acpi_os_validate_address(u8 space_id, | 242 | acpi_os_validate_address(u8 space_id, |
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index e08f7df85a4f..b5cca5daa348 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
@@ -55,7 +55,7 @@ acpi_status | |||
55 | acpi_initialize_tables(struct acpi_table_desc *initial_storage, | 55 | acpi_initialize_tables(struct acpi_table_desc *initial_storage, |
56 | u32 initial_table_count, u8 allow_resize); | 56 | u32 initial_table_count, u8 allow_resize); |
57 | 57 | ||
58 | acpi_status acpi_initialize_subsystem(void); | 58 | acpi_status __init acpi_initialize_subsystem(void); |
59 | 59 | ||
60 | acpi_status acpi_enable_subsystem(u32 flags); | 60 | acpi_status acpi_enable_subsystem(u32 flags); |
61 | 61 | ||
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 56bf492e7acc..fe8abc276437 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -344,7 +344,7 @@ typedef u32 acpi_integer; | |||
344 | 344 | ||
345 | /* 64-bit integers */ | 345 | /* 64-bit integers */ |
346 | 346 | ||
347 | typedef unsigned long long acpi_integer; | 347 | typedef unsigned long long acpi_integer; |
348 | #define ACPI_INTEGER_MAX ACPI_UINT64_MAX | 348 | #define ACPI_INTEGER_MAX ACPI_UINT64_MAX |
349 | #define ACPI_INTEGER_BIT_SIZE 64 | 349 | #define ACPI_INTEGER_BIT_SIZE 64 |
350 | #define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */ | 350 | #define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */ |
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h index 883ffe92148f..a87ef1c8d46b 100644 --- a/include/acpi/acutils.h +++ b/include/acpi/acutils.h | |||
@@ -390,6 +390,8 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object); | |||
390 | 390 | ||
391 | u8 acpi_ut_valid_internal_object(void *object); | 391 | u8 acpi_ut_valid_internal_object(void *object); |
392 | 392 | ||
393 | union acpi_operand_object *acpi_ut_create_package_object(u32 count); | ||
394 | |||
393 | union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size); | 395 | union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size); |
394 | 396 | ||
395 | union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size); | 397 | union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size); |
@@ -498,7 +500,8 @@ acpi_ut_display_init_pathname(u8 type, | |||
498 | acpi_status | 500 | acpi_status |
499 | acpi_ut_walk_aml_resources(u8 * aml, | 501 | acpi_ut_walk_aml_resources(u8 * aml, |
500 | acpi_size aml_length, | 502 | acpi_size aml_length, |
501 | acpi_walk_aml_callback user_function, void **context); | 503 | acpi_walk_aml_callback user_function, |
504 | void **context); | ||
502 | 505 | ||
503 | acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index); | 506 | acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index); |
504 | 507 | ||
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index dab2ec59a3b0..c785485e62a6 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h | |||
@@ -136,7 +136,7 @@ | |||
136 | 136 | ||
137 | /*! [Begin] no source code translation */ | 137 | /*! [Begin] no source code translation */ |
138 | 138 | ||
139 | #if defined(__linux__) | 139 | #if defined(_LINUX) || defined(__linux__) |
140 | #include "aclinux.h" | 140 | #include "aclinux.h" |
141 | 141 | ||
142 | #elif defined(_AED_EFI) | 142 | #elif defined(_AED_EFI) |
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 5f532d2ac180..6ed15a0978eb 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
@@ -91,7 +91,10 @@ | |||
91 | #define ACPI_USE_NATIVE_DIVIDE | 91 | #define ACPI_USE_NATIVE_DIVIDE |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | #ifndef __cdecl | ||
94 | #define __cdecl | 95 | #define __cdecl |
96 | #endif | ||
97 | |||
95 | #define ACPI_FLUSH_CPU_CACHE() | 98 | #define ACPI_FLUSH_CPU_CACHE() |
96 | #endif /* __KERNEL__ */ | 99 | #endif /* __KERNEL__ */ |
97 | 100 | ||
@@ -103,7 +106,10 @@ | |||
103 | 106 | ||
104 | #define acpi_thread_id struct task_struct * | 107 | #define acpi_thread_id struct task_struct * |
105 | 108 | ||
106 | static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; } | 109 | static inline acpi_thread_id acpi_os_get_thread_id(void) |
110 | { | ||
111 | return current; | ||
112 | } | ||
107 | 113 | ||
108 | /* | 114 | /* |
109 | * The irqs_disabled() check is for resume from RAM. | 115 | * The irqs_disabled() check is for resume from RAM. |
@@ -112,15 +118,19 @@ static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; } | |||
112 | * to quiet __might_sleep() in kmalloc() and resume does not. | 118 | * to quiet __might_sleep() in kmalloc() and resume does not. |
113 | */ | 119 | */ |
114 | #include <acpi/actypes.h> | 120 | #include <acpi/actypes.h> |
115 | static inline void *acpi_os_allocate(acpi_size size) { | 121 | static inline void *acpi_os_allocate(acpi_size size) |
116 | return kmalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); | 122 | { |
123 | return kmalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL); | ||
117 | } | 124 | } |
118 | static inline void *acpi_os_allocate_zeroed(acpi_size size) { | 125 | static inline void *acpi_os_allocate_zeroed(acpi_size size) |
119 | return kzalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); | 126 | { |
127 | return kzalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL); | ||
120 | } | 128 | } |
121 | 129 | ||
122 | static inline void *acpi_os_acquire_object(acpi_cache_t * cache) { | 130 | static inline void *acpi_os_acquire_object(acpi_cache_t * cache) |
123 | return kmem_cache_zalloc(cache, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); | 131 | { |
132 | return kmem_cache_zalloc(cache, | ||
133 | irqs_disabled()? GFP_ATOMIC : GFP_KERNEL); | ||
124 | } | 134 | } |
125 | 135 | ||
126 | #define ACPI_ALLOCATE(a) acpi_os_allocate(a) | 136 | #define ACPI_ALLOCATE(a) acpi_os_allocate(a) |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 916c0102db5b..b4b0ffdab098 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #define ACPI_PDC_REVISION_ID 0x1 | 19 | #define ACPI_PDC_REVISION_ID 0x1 |
20 | 20 | ||
21 | #define ACPI_PSD_REV0_REVISION 0 /* Support for _PSD as in ACPI 3.0 */ | 21 | #define ACPI_PSD_REV0_REVISION 0 /* Support for _PSD as in ACPI 3.0 */ |
22 | #define ACPI_PSD_REV0_ENTRIES 5 | 22 | #define ACPI_PSD_REV0_ENTRIES 5 |
23 | 23 | ||
24 | /* | 24 | /* |
@@ -189,8 +189,9 @@ struct acpi_processor_errata { | |||
189 | } piix4; | 189 | } piix4; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | extern int acpi_processor_preregister_performance( | 192 | extern int acpi_processor_preregister_performance(struct |
193 | struct acpi_processor_performance **performance); | 193 | acpi_processor_performance |
194 | **performance); | ||
194 | 195 | ||
195 | extern int acpi_processor_register_performance(struct acpi_processor_performance | 196 | extern int acpi_processor_register_performance(struct acpi_processor_performance |
196 | *performance, unsigned int cpu); | 197 | *performance, unsigned int cpu); |
@@ -213,7 +214,8 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr); | |||
213 | void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, | 214 | void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, |
214 | unsigned int cpu); | 215 | unsigned int cpu); |
215 | int acpi_processor_ffh_cstate_probe(unsigned int cpu, | 216 | int acpi_processor_ffh_cstate_probe(unsigned int cpu, |
216 | struct acpi_processor_cx *cx, struct acpi_power_register *reg); | 217 | struct acpi_processor_cx *cx, |
218 | struct acpi_power_register *reg); | ||
217 | void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate); | 219 | void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate); |
218 | #else | 220 | #else |
219 | static inline void acpi_processor_power_init_bm_check(struct | 221 | static inline void acpi_processor_power_init_bm_check(struct |
@@ -224,12 +226,14 @@ static inline void acpi_processor_power_init_bm_check(struct | |||
224 | return; | 226 | return; |
225 | } | 227 | } |
226 | static inline int acpi_processor_ffh_cstate_probe(unsigned int cpu, | 228 | static inline int acpi_processor_ffh_cstate_probe(unsigned int cpu, |
227 | struct acpi_processor_cx *cx, struct acpi_power_register *reg) | 229 | struct acpi_processor_cx *cx, |
230 | struct acpi_power_register | ||
231 | *reg) | ||
228 | { | 232 | { |
229 | return -1; | 233 | return -1; |
230 | } | 234 | } |
231 | static inline void acpi_processor_ffh_cstate_enter( | 235 | static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx |
232 | struct acpi_processor_cx *cstate) | 236 | *cstate) |
233 | { | 237 | { |
234 | return; | 238 | return; |
235 | } | 239 | } |