diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:10:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-16 10:25:28 +1000 |
| commit | 48f87dd146a480c723774962eca675873a8aa1da (patch) | |
| tree | 71461989ebe8a20258ca4b0be341b755594a2b0b /include/xen/interface/sched.h | |
| parent | 6b62b3e134676687d5d666e6edc3b45f1507b2b7 (diff) | |
| parent | 06d1ee32a4d25356a710b49d5e95dbdd68bdf505 (diff) | |
| download | linux-48f87dd146a480c723774962eca675873a8aa1da.tar.bz2 | |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge the drm-fixes pull from Linus's tree into drm-next.
This is to fix some conflicts and make future pulls cleaner
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__ */ |