diff options
| author | Olof Johansson <olof@lixom.net> | 2015-11-09 16:35:19 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-11-09 16:35:19 -0800 |
| commit | 3e4dda70cc989a4f8079541972942609229e9f55 (patch) | |
| tree | 0342db762349057fd2e1efb621ba265df187f1dc /include/xen/interface/sched.h | |
| parent | 1b38b0e3349d733679e91b029a7f0dfd9e16a169 (diff) | |
| parent | 8713181dced9b2d0c2a99613449b9e45b656df83 (diff) | |
| download | linux-3e4dda70cc989a4f8079541972942609229e9f55.tar.bz2 | |
Merge branch 'next/arm64' into next/dt
Merging in the few patches I had kept separate from main next/dt, since others
got merged here directly.
* next/arm64:
arm64: defconfig: Enable PCI generic host bridge by default
arm64: Juno: Add support for the PCIe host bridge on Juno R1
Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
arm64: dts: mt8173: Add clocks for SCPSYS unit
arm64: dts: mt8173: Add subsystem clock controller device nodes
+ Linux 4.3-rc5
Diffstat (limited to 'include/xen/interface/sched.h')
| -rw-r--r-- | include/xen/interface/sched.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/xen/interface/sched.h b/include/xen/interface/sched.h index 9ce083960a25..f18490985fc8 100644 --- a/include/xen/interface/sched.h +++ b/include/xen/interface/sched.h @@ -107,5 +107,13 @@ struct sched_watchdog { #define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ #define SHUTDOWN_crash 3 /* Tell controller we've crashed. */ #define SHUTDOWN_watchdog 4 /* Restart because watchdog time expired. */ +/* + * Domain asked to perform 'soft reset' for it. The expected behavior is to + * reset internal Xen state for the domain returning it to the point where it + * was created but leaving the domain's memory contents and vCPU contexts + * intact. This will allow the domain to start over and set up all Xen specific + * interfaces again. + */ +#define SHUTDOWN_soft_reset 5 #endif /* __XEN_PUBLIC_SCHED_H__ */ |