lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-07-29 23:43:32 -07:00
parent dbfe898777 0642d2edc8
commit c32e7d669e
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/xen/grant-table.c
View File

@@ -82,7 +82,7 @@ static inline grant_ref_t *__gnttab_entry(grant_ref_t entry)
static int get_free_entries(unsigned count) static int get_free_entries(unsigned count)
{ {
unsigned long flags; unsigned long flags;
int ref, rc; int ref, rc = 0;
grant_ref_t head; grant_ref_t head;
spin_lock_irqsave(&gnttab_list_lock, flags); spin_lock_irqsave(&gnttab_list_lock, flags);

1
drivers/xen/xen-pciback/xenbus.c
View File

@@ -11,7 +11,6 @@
#include <xen/xenbus.h> #include <xen/xenbus.h>
#include <xen/events.h> #include <xen/events.h>
#include <asm/xen/pci.h> #include <asm/xen/pci.h>
#include <linux/workqueue.h>
#include "pciback.h" #include "pciback.h"
#define DRV_NAME "xen-pciback" #define DRV_NAME "xen-pciback"

4
drivers/xen/xen-selfballoon.c
View File

@@ -70,10 +70,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/workqueue.h>
#include <xen/balloon.h> #include <xen/balloon.h>
#include <xen/tmem.h> #include <xen/tmem.h>
#include <xen/xen.h>
/* Enable/disable with sysfs. */ /* Enable/disable with sysfs. */
static int xen_selfballooning_enabled __read_mostly; static int xen_selfballooning_enabled __read_mostly;