summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpiosxf.h
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2013-10-29 09:30:41 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-31 14:36:41 +0100
commit93220587f76b8a4eca89cb655fc0cc04e9da663d (patch)
tree0a8e1ba1334ce49e13388b45eeb07aed42471deb /include/acpi/acpiosxf.h
parent7e94632fc530d990de3110e6c53425d6e28dd238 (diff)
downloadlinux-stable-93220587f76b8a4eca89cb655fc0cc04e9da663d.tar.gz
linux-stable-93220587f76b8a4eca89cb655fc0cc04e9da663d.tar.bz2
linux-stable-93220587f76b8a4eca89cb655fc0cc04e9da663d.zip
ACPICA: Update aclinux.h for new OSL override mechanism.
The new ACPICA OSL override mechanism is used to solve these issues for the Linux OSL: 1. Linux can implement OSL using a macro. 2. Linux can implement OSL using an inlined function. 3. Linux can leave OSL not implemented for __KERNEL__ undefined code fragments. 4. Linux can add sparse declarators (__iomem) to OSL. 5. Linux can add memory tuning declarators (__init/__exit) to OSL. This patch also moves Linux specific OSL to aclinux.h which has not been maintained in the ACPICA code base. Lv Zheng. Known issue: From ACPICA's perspective, actypes.h should be included after inclusion of acenv.h. But currently in Linux, aclinux.h included by acenv.h has included actypes.h to find ACPICA types for inline functions. This is a known and existing issue and currently there is no real problem caused by this issue for Linux kernel build. Thus this issue is not covered by this cleanup commit. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/acpiosxf.h')
-rw-r--r--include/acpi/acpiosxf.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 55165fcd77d7..01e6c6d8b7e1 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -78,7 +78,7 @@ struct acpi_signal_fatal_info {
* OSL Initialization and shutdown primitives
*/
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize
-acpi_status __init acpi_os_initialize(void);
+acpi_status acpi_os_initialize(void);
#endif
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate
@@ -192,22 +192,18 @@ void acpi_os_free(void *memory);
#endif
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_map_memory
-void __iomem *acpi_os_map_memory(acpi_physical_address where,
- acpi_size length);
+void *acpi_os_map_memory(acpi_physical_address where, acpi_size length);
#endif
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_unmap_memory
-void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
+void acpi_os_unmap_memory(void *logical_address, acpi_size size);
#endif
-void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size);
-#ifdef ACPI_FUTURE_USAGE
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_physical_address
acpi_status
acpi_os_get_physical_address(void *logical_address,
acpi_physical_address * physical_address);
#endif
-#endif
/*
* Memory/Object Cache
@@ -251,9 +247,6 @@ acpi_os_remove_interrupt_handler(u32 interrupt_number,
acpi_osd_handler service_routine);
#endif
-void acpi_os_gpe_count(u32 gpe_number);
-void acpi_os_fixed_event_count(u32 fixed_event_number);
-
/*
* Threads and Scheduling
*/
@@ -267,9 +260,6 @@ acpi_os_execute(acpi_execute_type type,
acpi_osd_exec_callback function, void *context);
#endif
-acpi_status
-acpi_os_hotplug_execute(acpi_osd_exec_callback function, void *context);
-
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_events_complete
void acpi_os_wait_events_complete(void);
#endif
@@ -357,14 +347,12 @@ void acpi_os_vprintf(const char *format, va_list args);
void acpi_os_redirect_output(void *destination);
#endif
-#ifdef ACPI_FUTURE_USAGE
/*
* Debug input
*/
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_line
acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read);
#endif
-#endif
/*
* Obtain ACPI table(s)