Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan
  ACPI: Add CMOS RTC Operation Region handler support
  ACPI: Remove unused flags in acpi_device_flags
  ACPI: Remove useless initializers
  ACPI / battery: Make sure all spaces are in correct places
  ACPI: add _STA evaluation at do_acpi_find_child()
  ACPI / EC: access user space with get_user()/put_user()

diff --cc drivers/acpi/Makefile
Simple merge

diff --cc drivers/acpi/glue.c
Simple merge

diff --cc drivers/acpi/internal.h
index 520073ba36b497bf47cb6835aaa4f7a8b0897b4a,4163d4ba0175873a6ba2ece1928548ea04a857a4..3a50a34fe176b34bb77a3ff8cfff9588fe523da8
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -51,9 -45,12 +51,14 @@@ void acpi_memory_hotplug_init(void)
  #else
  static inline void acpi_memory_hotplug_init(void) {}
  #endif
+ #ifdef CONFIG_X86
+ void acpi_cmos_rtc_init(void);
+ #else
+ static inline void acpi_cmos_rtc_init(void) {}
+ #endif
  
 +extern bool acpi_force_hot_remove;
 +
  void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
                                    const char *name);
  int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,

diff --cc drivers/acpi/scan.c
index e0db2dc42370981ba7170f448ae9f061c8debfb5,a514be2164407ef148ef4ca728868427230485f1..dfe76f17cfc4740e0f260c70b25023339d37c210
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -2129,12 -2038,11 +2129,13 @@@ int __init acpi_scan_init(void
  
        acpi_pci_root_init();
        acpi_pci_link_init();
 +      acpi_processor_init();
        acpi_platform_init();
        acpi_lpss_init();
+       acpi_cmos_rtc_init();
        acpi_container_init();
        acpi_memory_hotplug_init();
 +      acpi_dock_init();
  
        mutex_lock(&acpi_scan_lock);
        /*

diff --cc include/acpi/acpi_bus.h
Simple merge