From 27a26b775ab89ff65d307de180e466d4c1215186 Mon Sep 17 00:00:00 2001 From: Huang Weiyi Date: Sat, 23 Jul 2011 16:21:57 +0800 Subject: xen/pciback: remove duplicated #include Remove duplicated #include('s) in drivers/xen/xen-pciback/xenbus.c Signed-off-by: Huang Weiyi Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/xen-pciback/xenbus.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers') 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 #include #include -#include #include "pciback.h" #define DRV_NAME "xen-pciback" -- cgit v1.2.3-70-g09d2 From f24144c0c397fe3697b5b563c4a86d4f1fb185cc Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 22 Jul 2011 14:00:06 -0400 Subject: xen/grant: Fix compile warning. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit drivers/xen/grant-table.c:85: warning: ‘rc’ may be used uninitialized in this function Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/grant-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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); -- cgit v1.2.3-70-g09d2 From 61077b2c50476ac85ced8a56fc6b5aaa3aa9c980 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 22 Jul 2011 14:01:16 -0400 Subject: xen/balloon: Fix compile errors - missing header files. With a specific enough .config file compile errors show for missing workqueue declarations. Reported-by: Randy Dunlap Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/xen-selfballoon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index 010937b5a7c..1b4afd81f87 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c @@ -70,10 +70,10 @@ #include #include #include - +#include #include - #include +#include /* Enable/disable with sysfs. */ static int xen_selfballooning_enabled __read_mostly; -- cgit v1.2.3-70-g09d2 From 65d4b248114e18b3d805c7ecb88d9ea64dd978e4 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Sat, 30 Jul 2011 11:21:09 -0400 Subject: xen/self-balloon: Add dependency on tmem. Without enabling CONFIG_XEN_TMEM we get this: drivers/xen/xen-selfballoon.c:461: undefined reference to `tmem_enabled' Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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 -- cgit v1.2.3-70-g09d2