Merge tag 'nfs-for-5.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d661cd0..1e4cdc6 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -905,6 +905,13 @@ static inline int acpi_dma_configure(struct device *dev,
        return 0;
 }
 
+static inline int acpi_dma_configure_id(struct device *dev,
+                                       enum dev_dma_attr attr,
+                                       const u32 *input_id)
+{
+       return 0;
+}
+
 #define ACPI_PTR(_ptr) (NULL)
 
 static inline void acpi_device_set_enumerated(struct acpi_device *adev)
@@ -1143,16 +1150,27 @@ struct acpi_probe_entry {
        kernel_ulong_t driver_data;
 };
 
-#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn)     \
+#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable,      \
+                                valid, data, fn)                       \
+       static const struct acpi_probe_entry __acpi_probe_##name        \
+               __used __section(__##table##_acpi_probe_table) = {      \
+                       .id = table_id,                                 \
+                       .type = subtable,                               \
+                       .subtable_valid = valid,                        \
+                       .probe_table = fn,                              \
+                       .driver_data = data,                            \
+               }
+
+#define ACPI_DECLARE_SUBTABLE_PROBE_ENTRY(table, name, table_id,       \
+                                         subtable, valid, data, fn)    \
        static const struct acpi_probe_entry __acpi_probe_##name        \
-               __used __section(__##table##_acpi_probe_table)          \
-                = {                                                    \
+               __used __section(__##table##_acpi_probe_table) = {      \
                        .id = table_id,                                 \
                        .type = subtable,                               \
                        .subtable_valid = valid,                        \
-                       .probe_table = (acpi_tbl_table_handler)fn,      \
-                       .driver_data = data,                            \
-                  }
+                       .probe_subtbl = fn,                             \
+                       .driver_data = data,                            \
+               }
 
 #define ACPI_PROBE_TABLE(name)         __##name##_acpi_probe_table
 #define ACPI_PROBE_TABLE_END(name)     __##name##_acpi_probe_table_end