diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-04 15:10:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-04 15:10:55 -0700 |
| commit | 7447691ef994ffd8072809a11ca9167a2d91564f (patch) | |
| tree | 66211f5748beb64c1c11bc9c2a5c09813fc9eb28 /drivers/xen/manage.c | |
| parent | 7c5c3a6177fa9646884114fc7f2e970b0bc50dc9 (diff) | |
| parent | 251e90e7e346a23742b90e2c4db19d322e071d99 (diff) | |
| download | linux-7447691ef994ffd8072809a11ca9167a2d91564f.tar.gz linux-7447691ef994ffd8072809a11ca9167a2d91564f.tar.bz2 linux-7447691ef994ffd8072809a11ca9167a2d91564f.zip | |
Merge tag 'for-linus-6.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- a series fine tuning virtio support for Xen guests, including removal
the now again unused "platform_has()" feature.
- a fix for host admin triggered reboot of Xen guests
- a simple spelling fix
* tag 'for-linus-6.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: don't require virtio with grants for non-PV guests
kernel: remove platform_has() infrastructure
virtio: replace restricted mem access flag with callback
xen: Fix spelling mistake
xen/manage: Use orderly_reboot() to reboot
Diffstat (limited to 'drivers/xen/manage.c')
| -rw-r--r-- | drivers/xen/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 3d5a384d65f7..c16df629907e 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -205,7 +205,7 @@ static void do_poweroff(void) static void do_reboot(void) { shutting_down = SHUTDOWN_POWEROFF; /* ? */ - ctrl_alt_del(); + orderly_reboot(); } static struct shutdown_handler shutdown_handlers[] = { |