Merge branches 'acpi-sysfs', 'acpi-apei' and 'acpi-blacklist'

[linux-2.6-block.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 27b4b66152637fe38b82711f0fa66d6ce946f7d7..35652fa872727f343f96eed13262682e9dce3665 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -228,8 +228,8 @@ struct acpi_subtable_proc {
        int count;
 };
 
-char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
-void __acpi_unmap_table(char *map, unsigned long size);
+void __iomem *__acpi_map_table(unsigned long phys, unsigned long size);
+void __acpi_unmap_table(void __iomem *map, unsigned long size);
 int early_acpi_boot_init(void);
 int acpi_boot_init (void);
 void acpi_boot_table_init (void);
@@ -427,6 +427,8 @@ void acpi_dev_free_resource_list(struct list_head *list);
 int acpi_dev_get_resources(struct acpi_device *adev, struct list_head *list,
                           int (*preproc)(struct acpi_resource *, void *),
                           void *preproc_data);
+int acpi_dev_get_dma_resources(struct acpi_device *adev,
+                              struct list_head *list);
 int acpi_dev_filter_resource_type(struct acpi_resource *ares,
                                  unsigned long types);
 
@@ -556,6 +558,25 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
 #define ACPI_OST_SC_DRIVER_LOAD_FAILURE                0x81
 #define ACPI_OST_SC_INSERT_NOT_SUPPORTED       0x82
 
+enum acpi_predicate {
+       all_versions,
+       less_than_or_equal,
+       equal,
+       greater_than_or_equal,
+};
+
+/* Table must be terminted by a NULL entry */
+struct acpi_platform_list {
+       char    oem_id[ACPI_OEM_ID_SIZE+1];
+       char    oem_table_id[ACPI_OEM_TABLE_ID_SIZE+1];
+       u32     oem_revision;
+       char    *table;
+       enum acpi_predicate pred;
+       char    *reason;
+       u32     data;
+};
+int acpi_match_platform_list(const struct acpi_platform_list *plat);
+
 extern void acpi_early_init(void);
 extern void acpi_subsystem_init(void);
 
@@ -774,6 +795,12 @@ static inline enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)
        return DEV_DMA_NOT_SUPPORTED;
 }
 
+static inline int acpi_dma_get_range(struct device *dev, u64 *dma_addr,
+                                    u64 *offset, u64 *size)
+{
+       return -ENODEV;
+}
+
 static inline int acpi_dma_configure(struct device *dev,
                                     enum dev_dma_attr attr)
 {