Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c32e7d66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dbfe8987 0642d2ed

drivers/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/xen/xen-pciback/xenbus.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/xen/xen-selfballoon.c

+2 −2
Original line number Diff line number Diff line
@@ -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;