tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 45a05f94 f38092b5

+7 -8
+1 -1
arch/x86/xen/Makefile
··· 15 15 grant-table.o suspend.o platform-pci-unplug.o \ 16 16 p2m.o 17 17 18 - obj-$(CONFIG_FUNCTION_TRACER) += trace.o 18 + obj-$(CONFIG_FTRACE) += trace.o 19 19 20 20 obj-$(CONFIG_SMP) += smp.o 21 21 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
+4 -6
arch/x86/xen/setup.c
··· 93 93 if (end <= start) 94 94 return 0; 95 95 96 - printk(KERN_INFO "xen_release_chunk: looking at area pfn %lx-%lx: ", 97 - start, end); 98 96 for(pfn = start; pfn < end; pfn++) { 99 97 unsigned long mfn = pfn_to_mfn(pfn); 100 98 ··· 105 107 106 108 ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, 107 109 &reservation); 108 - WARN(ret != 1, "Failed to release memory %lx-%lx err=%d\n", 109 - start, end, ret); 110 + WARN(ret != 1, "Failed to release pfn %lx err=%d\n", pfn, ret); 110 111 if (ret == 1) { 111 112 __set_phys_to_machine(pfn, INVALID_P2M_ENTRY); 112 113 len++; 113 114 } 114 115 } 115 - printk(KERN_CONT "%ld pages freed\n", len); 116 + printk(KERN_INFO "Freeing %lx-%lx pfn range: %lu pages freed\n", 117 + start, end, len); 116 118 117 119 return len; 118 120 } ··· 138 140 if (last_end < max_addr) 139 141 released += xen_release_chunk(last_end, max_addr); 140 142 141 - printk(KERN_INFO "released %ld pages of unused memory\n", released); 143 + printk(KERN_INFO "released %lu pages of unused memory\n", released); 142 144 return released; 143 145 } 144 146
+1
arch/x86/xen/trace.c
··· 1 1 #include <linux/ftrace.h> 2 + #include <xen/interface/xen.h> 2 3 3 4 #define N(x) [__HYPERVISOR_##x] = "("#x")" 4 5 static const char *xen_hypercall_names[] = {
+1 -1
drivers/xen/Kconfig
··· 11 11 12 12 config XEN_SELFBALLOONING 13 13 bool "Dynamically self-balloon kernel memory to target" 14 - depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP 14 + depends on XEN && XEN_BALLOON && CLEANCACHE && SWAP && XEN_TMEM 15 15 default n 16 16 help 17 17 Self-ballooning dynamically balloons available kernel memory driven