From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 25 May 2022 12:38:29 +0000 (+0200)
Subject: Merge back reboot/poweroff notifiers rework for 5.19-rc1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14c03a4a757f4be3e81c5004ca72f809ab04e0b1;p=people%2Fms%2Flinux.git

Merge back reboot/poweroff notifiers rework for 5.19-rc1.
---

14c03a4a757f4be3e81c5004ca72f809ab04e0b1
diff --cc arch/x86/xen/enlighten_pv.c
index ca85d1409917,af1f6e886225..f33a4421e7cd
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@@ -30,6 -30,8 +30,7 @@@
  #include <linux/pci.h>
  #include <linux/gfp.h>
  #include <linux/edd.h>
 -#include <linux/objtool.h>
+ #include <linux/reboot.h>
  
  #include <xen/xen.h>
  #include <xen/events.h>