diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:18:16 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:18:16 +0200 |
commit | 6af597de62a365dfec6021b9796aa302044e7cc3 (patch) | |
tree | 23e365cc4a4e6dff940f5acbb466edbe28160d68 /include/xen/interface/sched.h | |
parent | 558a65bc31a0c7811b34dad32f51f47c55a40000 (diff) | |
parent | 5aa5050787f449e7eaef2c5ec93c7b357aa7dcdc (diff) |
Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts
Conflicts:
kernel/sched/fair.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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__ */ |