Pull bugzilla-292300 into release branch

diff --combined drivers/acpi/sleep/main.c
index caf8721ae6fb4964c60ad67c60aa4fa5f63c07a5,9426ac1fc86bfb7081ed489c310c59c5333487e5..be616317fe53ea786d689fd380a1aa5d8c5abf2f
--- 1/drivers/acpi/sleep/main.c
--- 2/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@@ -44,7 -44,6 +44,6 @@@ int acpi_sleep_prepare(u32 acpi_state
        ACPI_FLUSH_CPU_CACHE();
        acpi_enable_wakeup_device_prep(acpi_state);
  #endif
-       acpi_gpe_sleep_prepare(acpi_state);
        acpi_enter_sleep_state_prep(acpi_state);
        return 0;
  }
@@@ -256,11 -255,6 +255,11 @@@ static int acpi_hibernation_enter(void
  
  static void acpi_hibernation_finish(void)
  {
 +      /*
 +       * If ACPI is not enabled by the BIOS and the boot kernel, we need to
 +       * enable it here.
 +       */
 +      acpi_enable();
        acpi_leave_sleep_state(ACPI_STATE_S4);
        acpi_disable_wakeup_device(ACPI_STATE_S4);
  

diff --combined include/acpi/acpi_bus.h
index 8a388e766162bfcfe4a494ace6641c8a00affdab,17500a1187820468eed4db098b8c9f8011054e44..7b74b60a68a47b26d3addf541b3440f23bd947ad
--- 1/include/acpi/acpi_bus.h
--- 2/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@@ -264,7 -264,6 +264,6 @@@ struct acpi_device_wakeup_flags 
  
  struct acpi_device_wakeup_state {
        u8 enabled:1;
-       u8 active:1;
  };
  
  struct acpi_device_wakeup {
@@@ -333,7 -332,6 +332,7 @@@ int acpi_bus_get_power(acpi_handle hand
  int acpi_bus_set_power(acpi_handle handle, int state);
  #ifdef CONFIG_ACPI_PROC_EVENT
  int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data);
 +int acpi_bus_generate_proc_event4(const char *class, const char *bid, u8 type, int data);
  int acpi_bus_receive_event(struct acpi_bus_event *event);
  #else
  static inline int acpi_bus_generate_proc_event(struct acpi_device *device, u8 type, int data)