diff options
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/xen/grant-table.c | 2 | ||||
| -rw-r--r-- | drivers/xen/xen-pciback/xenbus.c | 1 | ||||
| -rw-r--r-- | drivers/xen/xen-selfballoon.c | 5 |
4 files changed, 5 insertions, 5 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 diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index fd725cde6ad..4f44b347b24 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -82,7 +82,7 @@ static inline grant_ref_t *__gnttab_entry(grant_ref_t entry) static int get_free_entries(unsigned count) { unsigned long flags; - int ref, rc; + int ref, rc = 0; grant_ref_t head; spin_lock_irqsave(&gnttab_list_lock, flags); diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c index 206c4ce030b..978d2c6f5dc 100644 --- a/drivers/xen/xen-pciback/xenbus.c +++ b/drivers/xen/xen-pciback/xenbus.c @@ -11,7 +11,6 @@ #include <xen/xenbus.h> #include <xen/events.h> #include <asm/xen/pci.h> -#include <linux/workqueue.h> #include "pciback.h" #define DRV_NAME "xen-pciback" diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index 010937b5a7c..6ea852e2516 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c @@ -70,10 +70,11 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/mman.h> - +#include <linux/module.h> +#include <linux/workqueue.h> #include <xen/balloon.h> - #include <xen/tmem.h> +#include <xen/xen.h> /* Enable/disable with sysfs. */ static int xen_selfballooning_enabled __read_mostly; |