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

Commit 45a05f94 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/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
  xen: Fix misleading WARN message at xen_release_chunk
  xen: Fix printk() format in xen/setup.c
  xen/tracing: it looks like we wanted CONFIG_FTRACE
  xen/self-balloon: Add dependency on tmem.
  xen/balloon: Fix compile errors - missing header files.
  xen/grant: Fix compile warning.
  xen/pciback: remove duplicated #include
parents f38092b5 c00c8aa2

arch/x86/xen/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ 
			grant-table.o suspend.o platform-pci-unplug.o \

			p2m.o



obj-$(CONFIG_FUNCTION_TRACER) += trace.o

obj-$(CONFIG_FTRACE) += trace.o



obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

arch/x86/xen/setup.c

+4 −6
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ static unsigned long __init xen_release_chunk(phys_addr_t start_addr, 
	if (end <= start)

		return 0;



	printk(KERN_INFO "xen_release_chunk: looking at area pfn %lx-%lx: ",

	       start, end);

	for(pfn = start; pfn < end; pfn++) {

		unsigned long mfn = pfn_to_mfn(pfn);
@@ -107,14 +105,14 @@ static unsigned long __init xen_release_chunk(phys_addr_t start_addr, 


		ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,

					   &reservation);

		WARN(ret != 1, "Failed to release memory %lx-%lx err=%d\n",

		     start, end, ret);

		WARN(ret != 1, "Failed to release pfn %lx err=%d\n", pfn, ret);

		if (ret == 1) {

			__set_phys_to_machine(pfn, INVALID_P2M_ENTRY);

			len++;

		}

	}

	printk(KERN_CONT "%ld pages freed\n", len);

	printk(KERN_INFO "Freeing  %lx-%lx pfn range: %lu pages freed\n",

	       start, end, len);



	return len;

}
@@ -140,7 +138,7 @@ static unsigned long __init xen_return_unused_memory(unsigned long max_pfn, 
	if (last_end < max_addr)

		released += xen_release_chunk(last_end, max_addr);



	printk(KERN_INFO "released %ld pages of unused memory\n", released);

	printk(KERN_INFO "released %lu pages of unused memory\n", released);

	return released;

}

arch/x86/xen/trace.c

+1 −0
Original line number Diff line number Diff line 
#include <linux/ftrace.h>

#include <xen/interface/xen.h>



#define N(x)	[__HYPERVISOR_##x] = "("#x")"

static const char *xen_hypercall_names[] = {

drivers/xen/Kconfig

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