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

Commit aefd1404 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.15-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:
 "This contains two build fixes for clang and two fixes for rather
  unlikely situations in the Xen gntdev driver"

* tag 'for-linus-4.15-rc8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/gntdev: Fix partial gntdev_mmap() cleanup
  xen/gntdev: Fix off-by-one error when unmapping with holes
  x86: xen: remove the use of VLAIS
  x86/xen/time: fix section mismatch for xen_init_time_ops()
parents 4e67483a cf2acf66

arch/x86/xen/mmu_pv.c

+3 −5
Original line number Diff line number Diff line
@@ -1325,20 +1325,18 @@ static void xen_flush_tlb_others(const struct cpumask *cpus, 
{

	struct {

		struct mmuext_op op;

#ifdef CONFIG_SMP

		DECLARE_BITMAP(mask, num_processors);

#else

		DECLARE_BITMAP(mask, NR_CPUS);

#endif

	} *args;

	struct multicall_space mcs;

	const size_t mc_entry_size = sizeof(args->op) +

		sizeof(args->mask[0]) * BITS_TO_LONGS(num_possible_cpus());



	trace_xen_mmu_flush_tlb_others(cpus, info->mm, info->start, info->end);



	if (cpumask_empty(cpus))

		return;		/* nothing to do */



	mcs = xen_mc_entry(sizeof(*args));

	mcs = xen_mc_entry(mc_entry_size);

	args = mcs.args;

	args->op.arg2.vcpumask = to_cpumask(args->mask);

arch/x86/xen/xen-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ u64 xen_clocksource_read(void); 
void xen_setup_cpu_clockevents(void);

void xen_save_time_memory_area(void);

void xen_restore_time_memory_area(void);

void __init xen_init_time_ops(void);

void __ref xen_init_time_ops(void);

void __init xen_hvm_init_time_ops(void);



irqreturn_t xen_debug_interrupt(int irq, void *dev_id);

drivers/xen/gntdev.c

+4 −4
Original line number Diff line number Diff line
@@ -380,10 +380,8 @@ static int unmap_grant_pages(struct grant_map *map, int offset, int pages) 
		}

		range = 0;

		while (range < pages) {

			if (map->unmap_ops[offset+range].handle == -1) {

				range--;

			if (map->unmap_ops[offset+range].handle == -1)

				break;

			}

			range++;

		}

		err = __unmap_grant_pages(map, offset, range);
@@ -1073,8 +1071,10 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma) 
out_unlock_put:

	mutex_unlock(&priv->lock);

out_put_map:

	if (use_ptemod)

	if (use_ptemod) {

		map->vma = NULL;

		unmap_grant_pages(map, 0, map->count);

	}

	gntdev_put_map(priv, map);

	return err;

}