diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-14 10:50:37 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-14 10:51:07 +0400 |
| commit | a4c98f8bbeafee12c979c90743f6fda94f7515c7 (patch) | |
| tree | 3dda24b8a2ec42ab7b42845cb68c8b6e1b0d501f /arch/x86/xen/Kconfig | |
| parent | f4ad9bd208c98f32a6f9136618e0b8bebe3fb370 (diff) | |
| parent | 85f2e689a5c8fb6ed8fdbee00109e7f6e5fefcb6 (diff) | |
| download | linux-a4c98f8bbeafee12c979c90743f6fda94f7515c7.tar.xz | |
Merge branch 'linus' into sched/locking
Merge reason: Pick up this upstream commit:
6631e635c65d: block: don't flush plugged IO on forced preemtion scheduling
As it modifies the scheduler and we'll queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/Kconfig')
| -rw-r--r-- | arch/x86/xen/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 1c7121ba18ff..5cc821cb2e09 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -39,6 +39,7 @@ config XEN_MAX_DOMAIN_MEMORY config XEN_SAVE_RESTORE bool depends on XEN + select HIBERNATE_CALLBACKS default y config XEN_DEBUG_FS |