aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:13:36 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:13:36 -0500
commite5e54bc86a1fed9849b22fd736c30b23c4719046 (patch)
treec53d0d5a7d6e2806bc154f8fc1642ec7a6684ca1 /include
parent70ec75c5b8e0bda7a16fb387f91e08545f379a0e (diff)
parent5229e87d59cef33539322948bd8e3b5a537f7c97 (diff)
Merge branches 'release' and 'stats' into release
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acglobal.h4
-rw-r--r--include/acpi/acpiosxf.h3
-rw-r--r--include/linux/acpi.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index 347a911d823..47a1fd8f2d8 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -117,10 +117,6 @@ extern u32 acpi_dbg_layer;
extern u32 acpi_gbl_nesting_level;
-/* Event counters */
-
-ACPI_EXTERN u32 acpi_gpe_count;
-
/* Support for dynamic control method tracing mechanism */
ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index ca882b8e7d1..1a16cfbe9e0 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -181,6 +181,9 @@ acpi_os_install_interrupt_handler(u32 gsi,
acpi_status
acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler service_routine);
+void acpi_os_gpe_count(u32 gpe_number);
+void acpi_os_fixed_event_count(u32 fixed_event_number);
+
/*
* Threads and Scheduling
*/
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index de09704d3dd..cf13bec517b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -114,7 +114,9 @@ int acpi_unmap_lsapic(int cpu);
int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
+void acpi_irq_stats_init(void);
+extern u32 acpi_irq_handled;
extern int acpi_mp_config;
extern struct acpi_mcfg_allocation *pci_mmcfg_config;