Merge tag 'for-linus-5.7-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (e6383b18) · Commits · 戴 / test

arch/x86/xen/setup.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -985,7 +985,7 @@ void xen_enable_syscall(void)
	#endif /* CONFIG_X86_64 */		#endif /* CONFIG_X86_64 */
	}		}

	void __init xen_pvmmu_arch_setup(void)		static void __init xen_pvmmu_arch_setup(void)
	{		{
	HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);		HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
	HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);		HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);

arch/x86/xen/xen-head.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ SYM_CODE_START(startup_xen)
	#ifdef CONFIG_X86_64		#ifdef CONFIG_X86_64
	mov initial_stack(%rip), %rsp		mov initial_stack(%rip), %rsp
	#else		#else
	mov pa(initial_stack), %esp		mov initial_stack, %esp
	#endif		#endif

	#ifdef CONFIG_X86_64		#ifdef CONFIG_X86_64

drivers/block/xen-blkfront.c

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@
	#include <linux/bitmap.h>		#include <linux/bitmap.h>
	#include <linux/list.h>		#include <linux/list.h>
	#include <linux/workqueue.h>		#include <linux/workqueue.h>
			#include <linux/sched/mm.h>

	#include <xen/xen.h>		#include <xen/xen.h>
	#include <xen/xenbus.h>		#include <xen/xenbus.h>
	@@ -2189,10 +2190,12 @@ static void blkfront_setup_discard(struct blkfront_info *info)

	static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)		static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
	{		{
	unsigned int psegs, grants;		unsigned int psegs, grants, memflags;
	int err, i;		int err, i;
	struct blkfront_info *info = rinfo->dev_info;		struct blkfront_info *info = rinfo->dev_info;

			memflags = memalloc_noio_save();

	if (info->max_indirect_segments == 0) {		if (info->max_indirect_segments == 0) {
	if (!HAS_EXTRA_REQ)		if (!HAS_EXTRA_REQ)
	grants = BLKIF_MAX_SEGMENTS_PER_REQUEST;		grants = BLKIF_MAX_SEGMENTS_PER_REQUEST;
	@@ -2224,7 +2227,7 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)

	BUG_ON(!list_empty(&rinfo->indirect_pages));		BUG_ON(!list_empty(&rinfo->indirect_pages));
	for (i = 0; i < num; i++) {		for (i = 0; i < num; i++) {
	struct page *indirect_page = alloc_page(GFP_NOIO);		struct page *indirect_page = alloc_page(GFP_KERNEL);
	if (!indirect_page)		if (!indirect_page)
	goto out_of_memory;		goto out_of_memory;
	list_add(&indirect_page->lru, &rinfo->indirect_pages);		list_add(&indirect_page->lru, &rinfo->indirect_pages);
	@@ -2235,15 +2238,15 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
	rinfo->shadow[i].grants_used =		rinfo->shadow[i].grants_used =
	kvcalloc(grants,		kvcalloc(grants,
	sizeof(rinfo->shadow[i].grants_used[0]),		sizeof(rinfo->shadow[i].grants_used[0]),
	GFP_NOIO);		GFP_KERNEL);
	rinfo->shadow[i].sg = kvcalloc(psegs,		rinfo->shadow[i].sg = kvcalloc(psegs,
	sizeof(rinfo->shadow[i].sg[0]),		sizeof(rinfo->shadow[i].sg[0]),
	GFP_NOIO);		GFP_KERNEL);
	if (info->max_indirect_segments)		if (info->max_indirect_segments)
	rinfo->shadow[i].indirect_grants =		rinfo->shadow[i].indirect_grants =
	kvcalloc(INDIRECT_GREFS(grants),		kvcalloc(INDIRECT_GREFS(grants),
	sizeof(rinfo->shadow[i].indirect_grants[0]),		sizeof(rinfo->shadow[i].indirect_grants[0]),
	GFP_NOIO);		GFP_KERNEL);
	if ((rinfo->shadow[i].grants_used == NULL) \|\|		if ((rinfo->shadow[i].grants_used == NULL) \|\|
	(rinfo->shadow[i].sg == NULL) \|\|		(rinfo->shadow[i].sg == NULL) \|\|
	(info->max_indirect_segments &&		(info->max_indirect_segments &&
	@@ -2252,6 +2255,7 @@ static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo)
	sg_init_table(rinfo->shadow[i].sg, psegs);		sg_init_table(rinfo->shadow[i].sg, psegs);
	}		}

			memalloc_noio_restore(memflags);

	return 0;		return 0;

	@@ -2271,6 +2275,9 @@ out_of_memory:
	__free_page(indirect_page);		__free_page(indirect_page);
	}		}
	}		}

			memalloc_noio_restore(memflags);

	return -ENOMEM;		return -ENOMEM;
	}		}

drivers/xen/events/events_2l.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -53,37 +53,37 @@ static void evtchn_2l_bind_to_cpu(struct irq_info *info, unsigned cpu)
	set_bit(info->evtchn, BM(per_cpu(cpu_evtchn_mask, cpu)));		set_bit(info->evtchn, BM(per_cpu(cpu_evtchn_mask, cpu)));
	}		}

	static void evtchn_2l_clear_pending(unsigned port)		static void evtchn_2l_clear_pending(evtchn_port_t port)
	{		{
	struct shared_info *s = HYPERVISOR_shared_info;		struct shared_info *s = HYPERVISOR_shared_info;
	sync_clear_bit(port, BM(&s->evtchn_pending[0]));		sync_clear_bit(port, BM(&s->evtchn_pending[0]));
	}		}

	static void evtchn_2l_set_pending(unsigned port)		static void evtchn_2l_set_pending(evtchn_port_t port)
	{		{
	struct shared_info *s = HYPERVISOR_shared_info;		struct shared_info *s = HYPERVISOR_shared_info;
	sync_set_bit(port, BM(&s->evtchn_pending[0]));		sync_set_bit(port, BM(&s->evtchn_pending[0]));
	}		}

	static bool evtchn_2l_is_pending(unsigned port)		static bool evtchn_2l_is_pending(evtchn_port_t port)
	{		{
	struct shared_info *s = HYPERVISOR_shared_info;		struct shared_info *s = HYPERVISOR_shared_info;
	return sync_test_bit(port, BM(&s->evtchn_pending[0]));		return sync_test_bit(port, BM(&s->evtchn_pending[0]));
	}		}

	static bool evtchn_2l_test_and_set_mask(unsigned port)		static bool evtchn_2l_test_and_set_mask(evtchn_port_t port)
	{		{
	struct shared_info *s = HYPERVISOR_shared_info;		struct shared_info *s = HYPERVISOR_shared_info;
	return sync_test_and_set_bit(port, BM(&s->evtchn_mask[0]));		return sync_test_and_set_bit(port, BM(&s->evtchn_mask[0]));
	}		}

	static void evtchn_2l_mask(unsigned port)		static void evtchn_2l_mask(evtchn_port_t port)
	{		{
	struct shared_info *s = HYPERVISOR_shared_info;		struct shared_info *s = HYPERVISOR_shared_info;
	sync_set_bit(port, BM(&s->evtchn_mask[0]));		sync_set_bit(port, BM(&s->evtchn_mask[0]));
	}		}

	static void evtchn_2l_unmask(unsigned port)		static void evtchn_2l_unmask(evtchn_port_t port)
	{		{
	struct shared_info *s = HYPERVISOR_shared_info;		struct shared_info *s = HYPERVISOR_shared_info;
	unsigned int cpu = get_cpu();		unsigned int cpu = get_cpu();
	@@ -173,7 +173,7 @@ static void evtchn_2l_handle_events(unsigned cpu)
	/* Timer interrupt has highest priority. */		/* Timer interrupt has highest priority. */
	irq = irq_from_virq(cpu, VIRQ_TIMER);		irq = irq_from_virq(cpu, VIRQ_TIMER);
	if (irq != -1) {		if (irq != -1) {
	unsigned int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);
	word_idx = evtchn / BITS_PER_LONG;		word_idx = evtchn / BITS_PER_LONG;
	bit_idx = evtchn % BITS_PER_LONG;		bit_idx = evtchn % BITS_PER_LONG;
	if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx))		if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx))
	@@ -228,7 +228,7 @@ static void evtchn_2l_handle_events(unsigned cpu)

	do {		do {
	xen_ulong_t bits;		xen_ulong_t bits;
	int port;		evtchn_port_t port;

	bits = MASK_LSBS(pending_bits, bit_idx);		bits = MASK_LSBS(pending_bits, bit_idx);

drivers/xen/events/events_base.c

+48 −45

Original line number	Original line	Diff line number	Diff line
	@@ -116,7 +116,7 @@ static void clear_evtchn_to_irq_all(void)
	}		}
	}		}

	static int set_evtchn_to_irq(unsigned evtchn, unsigned irq)		static int set_evtchn_to_irq(evtchn_port_t evtchn, unsigned int irq)
	{		{
	unsigned row;		unsigned row;
	unsigned col;		unsigned col;
	@@ -143,7 +143,7 @@ static int set_evtchn_to_irq(unsigned evtchn, unsigned irq)
	return 0;		return 0;
	}		}

	int get_evtchn_to_irq(unsigned evtchn)		int get_evtchn_to_irq(evtchn_port_t evtchn)
	{		{
	if (evtchn >= xen_evtchn_max_channels())		if (evtchn >= xen_evtchn_max_channels())
	return -1;		return -1;
	@@ -162,7 +162,7 @@ struct irq_info *info_for_irq(unsigned irq)
	static int xen_irq_info_common_setup(struct irq_info *info,		static int xen_irq_info_common_setup(struct irq_info *info,
	unsigned irq,		unsigned irq,
	enum xen_irq_type type,		enum xen_irq_type type,
	unsigned evtchn,		evtchn_port_t evtchn,
	unsigned short cpu)		unsigned short cpu)
	{		{
	int ret;		int ret;
	@@ -184,7 +184,7 @@ static int xen_irq_info_common_setup(struct irq_info *info,
	}		}

	static int xen_irq_info_evtchn_setup(unsigned irq,		static int xen_irq_info_evtchn_setup(unsigned irq,
	unsigned evtchn)		evtchn_port_t evtchn)
	{		{
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);

	@@ -193,7 +193,7 @@ static int xen_irq_info_evtchn_setup(unsigned irq,

	static int xen_irq_info_ipi_setup(unsigned cpu,		static int xen_irq_info_ipi_setup(unsigned cpu,
	unsigned irq,		unsigned irq,
	unsigned evtchn,		evtchn_port_t evtchn,
	enum ipi_vector ipi)		enum ipi_vector ipi)
	{		{
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);
	@@ -207,7 +207,7 @@ static int xen_irq_info_ipi_setup(unsigned cpu,

	static int xen_irq_info_virq_setup(unsigned cpu,		static int xen_irq_info_virq_setup(unsigned cpu,
	unsigned irq,		unsigned irq,
	unsigned evtchn,		evtchn_port_t evtchn,
	unsigned virq)		unsigned virq)
	{		{
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);
	@@ -220,7 +220,7 @@ static int xen_irq_info_virq_setup(unsigned cpu,
	}		}

	static int xen_irq_info_pirq_setup(unsigned irq,		static int xen_irq_info_pirq_setup(unsigned irq,
	unsigned evtchn,		evtchn_port_t evtchn,
	unsigned pirq,		unsigned pirq,
	unsigned gsi,		unsigned gsi,
	uint16_t domid,		uint16_t domid,
	@@ -245,7 +245,7 @@ static void xen_irq_info_cleanup(struct irq_info *info)
	/*		/*
	* Accessors for packed IRQ information.		* Accessors for packed IRQ information.
	*/		*/
	unsigned int evtchn_from_irq(unsigned irq)		evtchn_port_t evtchn_from_irq(unsigned irq)
	{		{
	if (WARN(irq >= nr_irqs, "Invalid irq %d!\n", irq))		if (WARN(irq >= nr_irqs, "Invalid irq %d!\n", irq))
	return 0;		return 0;
	@@ -253,7 +253,7 @@ unsigned int evtchn_from_irq(unsigned irq)
	return info_for_irq(irq)->evtchn;		return info_for_irq(irq)->evtchn;
	}		}

	unsigned irq_from_evtchn(unsigned int evtchn)		unsigned int irq_from_evtchn(evtchn_port_t evtchn)
	{		{
	return get_evtchn_to_irq(evtchn);		return get_evtchn_to_irq(evtchn);
	}		}
	@@ -304,7 +304,7 @@ unsigned cpu_from_irq(unsigned irq)
	return info_for_irq(irq)->cpu;		return info_for_irq(irq)->cpu;
	}		}

	unsigned int cpu_from_evtchn(unsigned int evtchn)		unsigned int cpu_from_evtchn(evtchn_port_t evtchn)
	{		{
	int irq = get_evtchn_to_irq(evtchn);		int irq = get_evtchn_to_irq(evtchn);
	unsigned ret = 0;		unsigned ret = 0;
	@@ -330,9 +330,9 @@ static bool pirq_needs_eoi_flag(unsigned irq)
	return info->u.pirq.flags & PIRQ_NEEDS_EOI;		return info->u.pirq.flags & PIRQ_NEEDS_EOI;
	}		}

	static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)		static void bind_evtchn_to_cpu(evtchn_port_t evtchn, unsigned int cpu)
	{		{
	int irq = get_evtchn_to_irq(chn);		int irq = get_evtchn_to_irq(evtchn);
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);

	BUG_ON(irq == -1);		BUG_ON(irq == -1);
	@@ -354,7 +354,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
	*/		*/
	void notify_remote_via_irq(int irq)		void notify_remote_via_irq(int irq)
	{		{
	int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);

	if (VALID_EVTCHN(evtchn))		if (VALID_EVTCHN(evtchn))
	notify_remote_via_evtchn(evtchn);		notify_remote_via_evtchn(evtchn);
	@@ -445,7 +445,7 @@ static void xen_free_irq(unsigned irq)
	irq_free_desc(irq);		irq_free_desc(irq);
	}		}

	static void xen_evtchn_close(unsigned int port)		static void xen_evtchn_close(evtchn_port_t port)
	{		{
	struct evtchn_close close;		struct evtchn_close close;

	@@ -472,7 +472,7 @@ static void pirq_query_unmask(int irq)

	static void eoi_pirq(struct irq_data *data)		static void eoi_pirq(struct irq_data *data)
	{		{
	int evtchn = evtchn_from_irq(data->irq);		evtchn_port_t evtchn = evtchn_from_irq(data->irq);
	struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) };		struct physdev_eoi eoi = { .irq = pirq_from_irq(data->irq) };
	int rc = 0;		int rc = 0;

	@@ -508,7 +508,7 @@ static unsigned int __startup_pirq(unsigned int irq)
	{		{
	struct evtchn_bind_pirq bind_pirq;		struct evtchn_bind_pirq bind_pirq;
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);
	int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);
	int rc;		int rc;

	BUG_ON(info->type != IRQT_PIRQ);		BUG_ON(info->type != IRQT_PIRQ);
	@@ -561,7 +561,7 @@ static void shutdown_pirq(struct irq_data *data)
	{		{
	unsigned int irq = data->irq;		unsigned int irq = data->irq;
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);
	unsigned evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);

	BUG_ON(info->type != IRQT_PIRQ);		BUG_ON(info->type != IRQT_PIRQ);

	@@ -601,7 +601,7 @@ EXPORT_SYMBOL_GPL(xen_irq_from_gsi);

	static void __unbind_from_irq(unsigned int irq)		static void __unbind_from_irq(unsigned int irq)
	{		{
	int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);
	struct irq_info *info = irq_get_handler_data(irq);		struct irq_info *info = irq_get_handler_data(irq);

	if (info->refcnt > 0) {		if (info->refcnt > 0) {
	@@ -827,7 +827,7 @@ int xen_pirq_from_irq(unsigned irq)
	}		}
	EXPORT_SYMBOL_GPL(xen_pirq_from_irq);		EXPORT_SYMBOL_GPL(xen_pirq_from_irq);

	int bind_evtchn_to_irq(unsigned int evtchn)		int bind_evtchn_to_irq(evtchn_port_t evtchn)
	{		{
	int irq;		int irq;
	int ret;		int ret;
	@@ -870,8 +870,8 @@ EXPORT_SYMBOL_GPL(bind_evtchn_to_irq);
	static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)		static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
	{		{
	struct evtchn_bind_ipi bind_ipi;		struct evtchn_bind_ipi bind_ipi;
	int evtchn, irq;		evtchn_port_t evtchn;
	int ret;		int ret, irq;

	mutex_lock(&irq_mapping_update_lock);		mutex_lock(&irq_mapping_update_lock);

	@@ -909,7 +909,7 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
	}		}

	int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,		int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
	unsigned int remote_port)		evtchn_port_t remote_port)
	{		{
	struct evtchn_bind_interdomain bind_interdomain;		struct evtchn_bind_interdomain bind_interdomain;
	int err;		int err;
	@@ -924,10 +924,11 @@ int bind_interdomain_evtchn_to_irq(unsigned int remote_domain,
	}		}
	EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irq);		EXPORT_SYMBOL_GPL(bind_interdomain_evtchn_to_irq);

	static int find_virq(unsigned int virq, unsigned int cpu)		static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn)
	{		{
	struct evtchn_status status;		struct evtchn_status status;
	int port, rc = -ENOENT;		evtchn_port_t port;
			int rc = -ENOENT;

	memset(&status, 0, sizeof(status));		memset(&status, 0, sizeof(status));
	for (port = 0; port < xen_evtchn_max_channels(); port++) {		for (port = 0; port < xen_evtchn_max_channels(); port++) {
	@@ -939,7 +940,7 @@ static int find_virq(unsigned int virq, unsigned int cpu)
	if (status.status != EVTCHNSTAT_virq)		if (status.status != EVTCHNSTAT_virq)
	continue;		continue;
	if (status.u.virq == virq && status.vcpu == xen_vcpu_nr(cpu)) {		if (status.u.virq == virq && status.vcpu == xen_vcpu_nr(cpu)) {
	rc = port;		*evtchn = port;
	break;		break;
	}		}
	}		}
	@@ -962,7 +963,8 @@ EXPORT_SYMBOL_GPL(xen_evtchn_nr_channels);
	int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu)		int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu)
	{		{
	struct evtchn_bind_virq bind_virq;		struct evtchn_bind_virq bind_virq;
	int evtchn, irq, ret;		evtchn_port_t evtchn = 0;
			int irq, ret;

	mutex_lock(&irq_mapping_update_lock);		mutex_lock(&irq_mapping_update_lock);

	@@ -988,9 +990,8 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu, bool percpu)
	evtchn = bind_virq.port;		evtchn = bind_virq.port;
	else {		else {
	if (ret == -EEXIST)		if (ret == -EEXIST)
	ret = find_virq(virq, cpu);		ret = find_virq(virq, cpu, &evtchn);
	BUG_ON(ret < 0);		BUG_ON(ret < 0);
	evtchn = ret;
	}		}

	ret = xen_irq_info_virq_setup(cpu, irq, evtchn, virq);		ret = xen_irq_info_virq_setup(cpu, irq, evtchn, virq);
	@@ -1019,7 +1020,7 @@ static void unbind_from_irq(unsigned int irq)
	mutex_unlock(&irq_mapping_update_lock);		mutex_unlock(&irq_mapping_update_lock);
	}		}

	int bind_evtchn_to_irqhandler(unsigned int evtchn,		int bind_evtchn_to_irqhandler(evtchn_port_t evtchn,
	irq_handler_t handler,		irq_handler_t handler,
	unsigned long irqflags,		unsigned long irqflags,
	const char devname, void dev_id)		const char devname, void dev_id)
	@@ -1040,7 +1041,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
	EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);		EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler);

	int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,		int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
	unsigned int remote_port,		evtchn_port_t remote_port,
	irq_handler_t handler,		irq_handler_t handler,
	unsigned long irqflags,		unsigned long irqflags,
	const char *devname,		const char *devname,
	@@ -1132,7 +1133,7 @@ int xen_set_irq_priority(unsigned irq, unsigned priority)
	}		}
	EXPORT_SYMBOL_GPL(xen_set_irq_priority);		EXPORT_SYMBOL_GPL(xen_set_irq_priority);

	int evtchn_make_refcounted(unsigned int evtchn)		int evtchn_make_refcounted(evtchn_port_t evtchn)
	{		{
	int irq = get_evtchn_to_irq(evtchn);		int irq = get_evtchn_to_irq(evtchn);
	struct irq_info *info;		struct irq_info *info;
	@@ -1153,7 +1154,7 @@ int evtchn_make_refcounted(unsigned int evtchn)
	}		}
	EXPORT_SYMBOL_GPL(evtchn_make_refcounted);		EXPORT_SYMBOL_GPL(evtchn_make_refcounted);

	int evtchn_get(unsigned int evtchn)		int evtchn_get(evtchn_port_t evtchn)
	{		{
	int irq;		int irq;
	struct irq_info *info;		struct irq_info *info;
	@@ -1186,7 +1187,7 @@ int evtchn_get(unsigned int evtchn)
	}		}
	EXPORT_SYMBOL_GPL(evtchn_get);		EXPORT_SYMBOL_GPL(evtchn_get);

	void evtchn_put(unsigned int evtchn)		void evtchn_put(evtchn_port_t evtchn)
	{		{
	int irq = get_evtchn_to_irq(evtchn);		int irq = get_evtchn_to_irq(evtchn);
	if (WARN_ON(irq == -1))		if (WARN_ON(irq == -1))
	@@ -1252,7 +1253,7 @@ void xen_hvm_evtchn_do_upcall(void)
	EXPORT_SYMBOL_GPL(xen_hvm_evtchn_do_upcall);		EXPORT_SYMBOL_GPL(xen_hvm_evtchn_do_upcall);

	/* Rebind a new event channel to an existing irq. */		/* Rebind a new event channel to an existing irq. */
	void rebind_evtchn_irq(int evtchn, int irq)		void rebind_evtchn_irq(evtchn_port_t evtchn, int irq)
	{		{
	struct irq_info *info = info_for_irq(irq);		struct irq_info *info = info_for_irq(irq);

	@@ -1284,7 +1285,7 @@ void rebind_evtchn_irq(int evtchn, int irq)
	}		}

	/* Rebind an evtchn so that it gets delivered to a specific cpu */		/* Rebind an evtchn so that it gets delivered to a specific cpu */
	static int xen_rebind_evtchn_to_cpu(int evtchn, unsigned int tcpu)		static int xen_rebind_evtchn_to_cpu(evtchn_port_t evtchn, unsigned int tcpu)
	{		{
	struct evtchn_bind_vcpu bind_vcpu;		struct evtchn_bind_vcpu bind_vcpu;
	int masked;		int masked;
	@@ -1342,7 +1343,7 @@ EXPORT_SYMBOL_GPL(xen_set_affinity_evtchn);

	static void enable_dynirq(struct irq_data *data)		static void enable_dynirq(struct irq_data *data)
	{		{
	int evtchn = evtchn_from_irq(data->irq);		evtchn_port_t evtchn = evtchn_from_irq(data->irq);

	if (VALID_EVTCHN(evtchn))		if (VALID_EVTCHN(evtchn))
	unmask_evtchn(evtchn);		unmask_evtchn(evtchn);
	@@ -1350,7 +1351,7 @@ static void enable_dynirq(struct irq_data *data)

	static void disable_dynirq(struct irq_data *data)		static void disable_dynirq(struct irq_data *data)
	{		{
	int evtchn = evtchn_from_irq(data->irq);		evtchn_port_t evtchn = evtchn_from_irq(data->irq);

	if (VALID_EVTCHN(evtchn))		if (VALID_EVTCHN(evtchn))
	mask_evtchn(evtchn);		mask_evtchn(evtchn);
	@@ -1358,7 +1359,7 @@ static void disable_dynirq(struct irq_data *data)

	static void ack_dynirq(struct irq_data *data)		static void ack_dynirq(struct irq_data *data)
	{		{
	int evtchn = evtchn_from_irq(data->irq);		evtchn_port_t evtchn = evtchn_from_irq(data->irq);

	if (!VALID_EVTCHN(evtchn))		if (!VALID_EVTCHN(evtchn))
	return;		return;
	@@ -1385,7 +1386,7 @@ static void mask_ack_dynirq(struct irq_data *data)

	static int retrigger_dynirq(struct irq_data *data)		static int retrigger_dynirq(struct irq_data *data)
	{		{
	unsigned int evtchn = evtchn_from_irq(data->irq);		evtchn_port_t evtchn = evtchn_from_irq(data->irq);
	int masked;		int masked;

	if (!VALID_EVTCHN(evtchn))		if (!VALID_EVTCHN(evtchn))
	@@ -1440,7 +1441,8 @@ static void restore_pirqs(void)
	static void restore_cpu_virqs(unsigned int cpu)		static void restore_cpu_virqs(unsigned int cpu)
	{		{
	struct evtchn_bind_virq bind_virq;		struct evtchn_bind_virq bind_virq;
	int virq, irq, evtchn;		evtchn_port_t evtchn;
			int virq, irq;

	for (virq = 0; virq < NR_VIRQS; virq++) {		for (virq = 0; virq < NR_VIRQS; virq++) {
	if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1)		if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1)
	@@ -1465,7 +1467,8 @@ static void restore_cpu_virqs(unsigned int cpu)
	static void restore_cpu_ipis(unsigned int cpu)		static void restore_cpu_ipis(unsigned int cpu)
	{		{
	struct evtchn_bind_ipi bind_ipi;		struct evtchn_bind_ipi bind_ipi;
	int ipi, irq, evtchn;		evtchn_port_t evtchn;
			int ipi, irq;

	for (ipi = 0; ipi < XEN_NR_IPIS; ipi++) {		for (ipi = 0; ipi < XEN_NR_IPIS; ipi++) {
	if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1)		if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1)
	@@ -1489,7 +1492,7 @@ static void restore_cpu_ipis(unsigned int cpu)
	/* Clear an irq's pending state, in preparation for polling on it */		/* Clear an irq's pending state, in preparation for polling on it */
	void xen_clear_irq_pending(int irq)		void xen_clear_irq_pending(int irq)
	{		{
	int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);

	if (VALID_EVTCHN(evtchn))		if (VALID_EVTCHN(evtchn))
	clear_evtchn(evtchn);		clear_evtchn(evtchn);
	@@ -1497,7 +1500,7 @@ void xen_clear_irq_pending(int irq)
	EXPORT_SYMBOL(xen_clear_irq_pending);		EXPORT_SYMBOL(xen_clear_irq_pending);
	void xen_set_irq_pending(int irq)		void xen_set_irq_pending(int irq)
	{		{
	int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);

	if (VALID_EVTCHN(evtchn))		if (VALID_EVTCHN(evtchn))
	set_evtchn(evtchn);		set_evtchn(evtchn);
	@@ -1505,7 +1508,7 @@ void xen_set_irq_pending(int irq)

	bool xen_test_irq_pending(int irq)		bool xen_test_irq_pending(int irq)
	{		{
	int evtchn = evtchn_from_irq(irq);		evtchn_port_t evtchn = evtchn_from_irq(irq);
	bool ret = false;		bool ret = false;

	if (VALID_EVTCHN(evtchn))		if (VALID_EVTCHN(evtchn))
	@@ -1667,7 +1670,7 @@ module_param(fifo_events, bool, 0);
	void __init xen_init_IRQ(void)		void __init xen_init_IRQ(void)
	{		{
	int ret = -EINVAL;		int ret = -EINVAL;
	unsigned int evtchn;		evtchn_port_t evtchn;

	if (fifo_events)		if (fifo_events)
	ret = xen_evtchn_fifo_init();		ret = xen_evtchn_fifo_init();

Admin message