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

Commit 98f531da authored by Igor Mammedov's avatar Igor Mammedov Committed by Konrad Rzeszutek Wilk
Browse files

xen: Fix misleading WARN message at xen_release_chunk 



WARN message should not complain
 "Failed to release memory %lx-%lx err=%d\n"
                           ^^^^^^^
about range when it fails to release just one page,
instead it should say what pfn is not freed.

In addition line:
 printk(KERN_INFO "xen_release_chunk: looking at area pfn %lx-%lx: "
 ...
 printk(KERN_CONT "%lu pages freed\n", len);
will be broken if WARN in between this line is fired. So fix it
by using a single printk for this.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 8f3c5883

arch/x86/xen/setup.c

+3 −5
Original line number Diff line number Diff line
@@ -92,8 +92,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);
@@ -106,14 +104,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 "%lu pages freed\n", len);

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

	       start, end, len);



	return len;

}