diff options
Diffstat (limited to 'include/acpi/acpiosxf.h')
-rw-r--r-- | include/acpi/acpiosxf.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 66f1fd70e8c2..5b3d2bd4813a 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h | |||
@@ -7,7 +7,7 @@ | |||
7 | *****************************************************************************/ | 7 | *****************************************************************************/ |
8 | 8 | ||
9 | /* | 9 | /* |
10 | * Copyright (C) 2000 - 2012, Intel Corp. | 10 | * Copyright (C) 2000 - 2013, Intel Corp. |
11 | * All rights reserved. | 11 | * All rights reserved. |
12 | * | 12 | * |
13 | * Redistribution and use in source and binary forms, with or without | 13 | * Redistribution and use in source and binary forms, with or without |
@@ -102,10 +102,8 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table, | |||
102 | /* | 102 | /* |
103 | * Spinlock primitives | 103 | * Spinlock primitives |
104 | */ | 104 | */ |
105 | |||
106 | #ifndef acpi_os_create_lock | 105 | #ifndef acpi_os_create_lock |
107 | acpi_status | 106 | acpi_status acpi_os_create_lock(acpi_spinlock * out_handle); |
108 | acpi_os_create_lock(acpi_spinlock *out_handle); | ||
109 | #endif | 107 | #endif |
110 | 108 | ||
111 | void acpi_os_delete_lock(acpi_spinlock handle); | 109 | void acpi_os_delete_lock(acpi_spinlock handle); |
@@ -148,6 +146,8 @@ void acpi_os_release_mutex(acpi_mutex handle); | |||
148 | */ | 146 | */ |
149 | void *acpi_os_allocate(acpi_size size); | 147 | void *acpi_os_allocate(acpi_size size); |
150 | 148 | ||
149 | void acpi_os_free(void *memory); | ||
150 | |||
151 | void __iomem *acpi_os_map_memory(acpi_physical_address where, | 151 | void __iomem *acpi_os_map_memory(acpi_physical_address where, |
152 | acpi_size length); | 152 | acpi_size length); |
153 | 153 | ||
@@ -180,12 +180,13 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object); | |||
180 | * Interrupt handlers | 180 | * Interrupt handlers |
181 | */ | 181 | */ |
182 | acpi_status | 182 | acpi_status |
183 | acpi_os_install_interrupt_handler(u32 gsi, | 183 | acpi_os_install_interrupt_handler(u32 interrupt_number, |
184 | acpi_osd_handler service_routine, | 184 | acpi_osd_handler service_routine, |
185 | void *context); | 185 | void *context); |
186 | 186 | ||
187 | acpi_status | 187 | acpi_status |
188 | acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler service_routine); | 188 | acpi_os_remove_interrupt_handler(u32 interrupt_number, |
189 | acpi_osd_handler service_routine); | ||
189 | 190 | ||
190 | void acpi_os_gpe_count(u32 gpe_number); | 191 | void acpi_os_gpe_count(u32 gpe_number); |
191 | void acpi_os_fixed_event_count(u32 fixed_event_number); | 192 | void acpi_os_fixed_event_count(u32 fixed_event_number); |