aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 17:28:55 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 17:28:55 -0400
commit476525004ac7e2f990b6956efcd44d0780c2ab4c (patch)
tree158cd2bbfb232b4f4327b6c20a4e14c6b095a438 /include/acpi/acpi_bus.h
parentbd22dc17e49973d3d4925970260e9e37f7580a9f (diff)
parentec033d0a02901551346b9f43f8ff9bad51378891 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI & power management update from Len Brown: "Re-write of the turbostat tool. lower overhead was necessary for measuring very large system when they are very idle. IVB support in intel_idle It's what I run on my IVB, others should be able to also:-) ACPICA core update We have found some bugs due to divergence between Linux and the upstream ACPICA base. Most of these patches are to reduce that divergence to reduce the risk of future bugs. Some cpuidle updates, mostly for non-Intel More will be coming, as they depend on this part. Some thermal management changes needed by non-ACPI systems. Some _OST (OS Status Indication) updates for hot ACPI hot-plug." * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (51 commits) Thermal: Documentation update Thermal: Add Hysteresis attributes Thermal: Make Thermal trip points writeable ACPI/AC: prevent OOPS on some boxes due to missing check power_supply_register() return value check tools/power: turbostat: fix large c1% issue tools/power: turbostat v2 - re-write for efficiency ACPICA: Update to version 20120711 ACPICA: AcpiSrc: Fix some translation issues for Linux conversion ACPICA: Update header files copyrights to 2012 ACPICA: Add new ACPI table load/unload external interfaces ACPICA: Split file: tbxface.c -> tbxfload.c ACPICA: Add PCC address space to space ID decode function ACPICA: Fix some comment fields ACPICA: Table manager: deploy new firmware error/warning interfaces ACPICA: Add new interfaces for BIOS(firmware) errors and warnings ACPICA: Split exception code utilities to a new file, utexcep.c ACPI: acpi_pad: tune round_robin_time ACPICA: Update to version 20120620 ACPICA: Add support for implicit notify on multiple devices ACPICA: Update comments; no functional change ...
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r--include/acpi/acpi_bus.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 01e2925523ea..bde976ee068d 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -50,6 +50,9 @@ acpi_evaluate_reference(acpi_handle handle,
50 acpi_string pathname, 50 acpi_string pathname,
51 struct acpi_object_list *arguments, 51 struct acpi_object_list *arguments,
52 struct acpi_handle_list *list); 52 struct acpi_handle_list *list);
53acpi_status
54acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
55 u32 status_code, struct acpi_buffer *status_buf);
53 56
54struct acpi_pld { 57struct acpi_pld {
55 unsigned int revision:7; /* 0 */ 58 unsigned int revision:7; /* 0 */
@@ -174,7 +177,8 @@ struct acpi_device_flags {
174 u32 suprise_removal_ok:1; 177 u32 suprise_removal_ok:1;
175 u32 power_manageable:1; 178 u32 power_manageable:1;
176 u32 performance_manageable:1; 179 u32 performance_manageable:1;
177 u32 reserved:24; 180 u32 eject_pending:1;
181 u32 reserved:23;
178}; 182};
179 183
180/* File System */ 184/* File System */
@@ -326,6 +330,11 @@ struct acpi_bus_event {
326 u32 data; 330 u32 data;
327}; 331};
328 332
333struct acpi_eject_event {
334 acpi_handle handle;
335 u32 event;
336};
337
329extern struct kobject *acpi_kobj; 338extern struct kobject *acpi_kobj;
330extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); 339extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
331void acpi_bus_private_data_handler(acpi_handle, void *); 340void acpi_bus_private_data_handler(acpi_handle, void *);
@@ -363,6 +372,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver);
363void acpi_bus_unregister_driver(struct acpi_driver *driver); 372void acpi_bus_unregister_driver(struct acpi_driver *driver);
364int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, 373int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
365 acpi_handle handle, int type); 374 acpi_handle handle, int type);
375void acpi_bus_hot_remove_device(void *context);
366int acpi_bus_trim(struct acpi_device *start, int rmdevice); 376int acpi_bus_trim(struct acpi_device *start, int rmdevice);
367int acpi_bus_start(struct acpi_device *device); 377int acpi_bus_start(struct acpi_device *device);
368acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); 378acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);