diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 12:22:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 12:22:30 -0700 |
| commit | 45a05f9488911851f7a5c536df80b41f0105caf0 (patch) | |
| tree | e530376dbaf3581590e8e5d99cf35df5732bee44 /drivers | |
| parent | f38092b50f6e68d046ada7d2a4b3ecbbeab29fb4 (diff) | |
| parent | c00c8aa2d976e9ed1d12a57b42d6e9b27efb7abe (diff) | |
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
xen: Fix misleading WARN message at xen_release_chunk
xen: Fix printk() format in xen/setup.c
xen/tracing: it looks like we wanted CONFIG_FTRACE
xen/self-balloon: Add dependency on tmem.
xen/balloon: Fix compile errors - missing header files.
xen/grant: Fix compile warning.
xen/pciback: remove duplicated #include
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index f815283667a..5f7ff8e2fc1 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -11,7 +11,7 @@ config XEN_BALLOON config XEN_SELFBALLOONING bool "Dynamically self-balloon kernel memory to target" - depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP + depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP && XEN_TMEM default n help Self-ballooning dynamically balloons available kernel memory driven |