Commit 4844e7c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-7.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:

 - one simple cleanup

 - a fix for a corner case when running as Xen PV dom0

 - a fix of a regression for Xen PV guests, introduced in 7.0

* tag 'for-linus-7.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: Tolerate nested XEN_LAZY_MMU entering/leaving
  x86/xen: Fix xen_e820_swap_entry_with_ram()
  xen/arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in interface.h
parents 4c2cd91b 45944378

arch/x86/xen/mmu_pv.c

+6 −2
Original line number Diff line number Diff line
@@ -2145,7 +2145,10 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) 


static void xen_enter_lazy_mmu(void)

{

	preempt_disable();

	if (xen_get_lazy_mode() != XEN_LAZY_MMU)

		enter_lazy(XEN_LAZY_MMU);

	preempt_enable();

}



static void xen_flush_lazy_mmu(void)
@@ -2182,6 +2185,7 @@ static void xen_leave_lazy_mmu(void) 
{

	preempt_disable();

	xen_mc_flush();

	if (xen_get_lazy_mode() != XEN_LAZY_NONE)

		leave_lazy(XEN_LAZY_MMU);

	preempt_enable();

}

arch/x86/xen/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static void __init xen_e820_swap_entry_with_ram(struct e820_entry *swap_entry) 
			/* Fill new entry (keep size and page offset). */

			entry->type = swap_entry->type;

			entry->addr = entry_end - swap_size +

				      swap_addr - swap_entry->addr;

				      swap_entry->addr - swap_addr;

			entry->size = swap_entry->size;



			/* Convert old entry to RAM, align to pages. */

include/xen/arm/interface.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


#define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

/* Explicitly size integers that represent pfns in the interface with

 * Xen so that we can have one ABI that works for 32 and 64 bit guests.

 * Note that this means that the xen_pfn_t type may be capable of