diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:43:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-29 23:43:32 -0700 |
| commit | c32e7d669ef827f97d1aae8f6b34542665defbf6 (patch) | |
| tree | 369b180339369fa90515d89eb10d7385aa4d4f76 | |
| parent | dbfe89877741726c30efb41f0132e247a78c3681 (diff) | |
| parent | 0642d2edc858a1f08716bb32e1ab890db8dac246 (diff) | |
| download | talos-op-linux-c32e7d669ef827f97d1aae8f6b34542665defbf6.tar.gz talos-op-linux-c32e7d669ef827f97d1aae8f6b34542665defbf6.zip | |
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/balloon: Fix compile errors - missing header files.
xen/grant: Fix compile warning.
xen/pciback: remove duplicated #include
| -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 | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index fd725cde6ad1..4f44b347b24a 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 206c4ce030bc..978d2c6f5dca 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 010937b5a7c9..1b4afd81f872 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c @@ -70,10 +70,10 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/mman.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; |
