Merge branch 'acpi-bus'

* acpi-bus:
  ACPI / bus: Adjust ACPI subsystem initialization for new table loading mode
  ACPI / bus: Make acpi_get_first_physical_node() public

diff --combined include/linux/acpi.h
index c5eaf2f80a4c4c76c9cd6029e8e67e0d8d0449c2,536c12ed2669b64150ca04b194e61f098eb9d259..e7465528b8dcfe52de57663cfb5aedb3b8ed229c
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -85,6 -85,8 +85,8 @@@ static inline const char *acpi_dev_name
        return dev_name(&adev->dev);
  }
  
+ struct device *acpi_get_first_physical_node(struct acpi_device *adev);
+ 
  enum acpi_irq_model_id {
        ACPI_IRQ_MODEL_PIC = 0,
        ACPI_IRQ_MODEL_IOAPIC,
@@@ -634,6 -636,11 +636,11 @@@ static inline const char *acpi_dev_name
        return NULL;
  }
  
+ static inline struct device *acpi_get_first_physical_node(struct acpi_device *adev)
+ {
+       return NULL;
+ }
+ 
  static inline void acpi_early_init(void) { }
  static inline void acpi_subsystem_init(void) { }
  
@@@ -1056,7 -1063,7 +1063,7 @@@ static inline struct fwnode_handle *acp
        return NULL;
  }
  
 -#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, validate, data, fn) \
 +#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn) \
        static const void * __acpi_table_##name[]                       \
                __attribute__((unused))                                 \
                 = { (void *) table_id,                                 \