From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 15 Jun 2013 22:28:51 +0000 (+0200)
Subject: Merge branch 'acpi-assorted' into linux-next
X-Git-Tag: next-20130617~79^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3bd0f0e4973efe66e2a1ef2ec78f39cf8883322e;p=karo-tx-linux.git

Merge branch 'acpi-assorted' into linux-next

* acpi-assorted:
  ACPI / PM: acpi_processor_suspend() can be static
  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 / APEI: fix error return code in einj_init()
  ACPI: Remove unused flags in acpi_device_flags
  ACPI: Remove useless initializers
  ACPI / battery: Make sure all spaces are in correct places
  ACPI / ghes: Remove redundant platform_set_drvdata()
  ACPI: add _STA evaluation at do_acpi_find_child()
  ACPI / APEI: Add parameter check before error injection
  ACPI / LPSS: add support for Intel BayTrail
  ACPI / APEI: Update EINJ documentation for param1/param2
  xen / ACPI / sleep: Register an acpi_suspend_lowlevel callback.
  x86 / ACPI / sleep: Provide registration for acpi_suspend_lowlevel.
  ACPI / resources: call acpi_get_override_irq() only for legacy IRQ resources
  acpi: ec_sys: access user space with get_user()/put_user()
---

3bd0f0e4973efe66e2a1ef2ec78f39cf8883322e
diff --cc drivers/acpi/internal.h
index 18a9d2230a8b,4163d4ba0175..76650dc13328
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -46,9 -45,12 +46,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 f3f1718836d8,aa9e52a2519f..ab09b77ed035
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -2153,9 -2041,9 +2153,10 @@@ 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();