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/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
This commit is contained in:
Linus Torvalds
2011-08-06 12:22:30 -07:00
parent f38092b50f c00c8aa2d9
commit 45a05f9488
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/xen/Makefile
View File

@@ -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 \ grant-table.o suspend.o platform-pci-unplug.o \
p2m.o p2m.o
obj-$(CONFIG_FUNCTION_TRACER) += trace.o obj-$(CONFIG_FTRACE) += trace.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

10
arch/x86/xen/setup.c
View File

@@ -93,8 +93,6 @@ static unsigned long __init xen_release_chunk(phys_addr_t start_addr,
if (end <= start) if (end <= start)
return 0; return 0;
printk(KERN_INFO "xen_release_chunk: looking at area pfn %lx-%lx: ",
start, end);
for(pfn = start; pfn < end; pfn++) { for(pfn = start; pfn < end; pfn++) {
unsigned long mfn = pfn_to_mfn(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, ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
&reservation); &reservation);
WARN(ret != 1, "Failed to release memory %lx-%lx err=%d\n", WARN(ret != 1, "Failed to release pfn %lx err=%d\n", pfn, ret);
start, end, ret);
if (ret == 1) { if (ret == 1) {
__set_phys_to_machine(pfn, INVALID_P2M_ENTRY); __set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
len++; 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; return len;
} }
@@ -140,7 +138,7 @@ static unsigned long __init xen_return_unused_memory(unsigned long max_pfn,
if (last_end < max_addr) if (last_end < max_addr)
released += xen_release_chunk(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; return released;
} }

1
arch/x86/xen/trace.c
View File

@@ -1,4 +1,5 @@
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <xen/interface/xen.h>
#define N(x) [__HYPERVISOR_##x] = "("#x")" #define N(x) [__HYPERVISOR_##x] = "("#x")"
static const char *xen_hypercall_names[] = { static const char *xen_hypercall_names[] = {

2
drivers/xen/Kconfig
View File

@@ -11,7 +11,7 @@ config XEN_BALLOON
config XEN_SELFBALLOONING config XEN_SELFBALLOONING
bool "Dynamically self-balloon kernel memory to target" 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 default n
help help
Self-ballooning dynamically balloons available kernel memory driven Self-ballooning dynamically balloons available kernel memory driven