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

Commit 8562e89e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen fixes from Juergen Gross:
 "Three minor cleanups for xen related drivers"

* tag 'for-linus-4.13b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: dont fiddle with event channel masking in suspend/resume
  xen: selfballoon: remove unnecessary static in frontswap_selfshrink()
  xen: Drop un-informative message during boot
parents 3d9d7405 e91b2b11

drivers/xen/events/events_base.c

+3 −10
Original line number Diff line number Diff line
@@ -343,14 +343,6 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) 
	info->cpu = cpu;

}



static void xen_evtchn_mask_all(void)

{

	unsigned int evtchn;



	for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++)

		mask_evtchn(evtchn);

}



/**

 * notify_remote_via_irq - send event to remote end of event channel via irq

 * @irq: irq of event channel to send event to
@@ -1573,7 +1565,6 @@ void xen_irq_resume(void) 
	struct irq_info *info;



	/* New event-channel space is not 'live' yet. */

	xen_evtchn_mask_all();

	xen_evtchn_resume();



	/* No IRQ <-> event-channel mappings. */
@@ -1681,6 +1672,7 @@ module_param(fifo_events, bool, 0); 
void __init xen_init_IRQ(void)

{

	int ret = -EINVAL;

	unsigned int evtchn;



	if (fifo_events)

		ret = xen_evtchn_fifo_init();
@@ -1692,7 +1684,8 @@ void __init xen_init_IRQ(void) 
	BUG_ON(!evtchn_to_irq);



	/* No event channels are 'live' right now. */

	xen_evtchn_mask_all();

	for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++)

		mask_evtchn(evtchn);



	pirq_needs_eoi = pirq_needs_eoi_flag;

drivers/xen/xen-selfballoon.c

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ static unsigned long frontswap_inertia_counter; 
static void frontswap_selfshrink(void)

{

	static unsigned long cur_frontswap_pages;

	static unsigned long last_frontswap_pages;

	static unsigned long tgt_frontswap_pages;

	unsigned long last_frontswap_pages;

	unsigned long tgt_frontswap_pages;



	last_frontswap_pages = cur_frontswap_pages;

	cur_frontswap_pages = frontswap_curr_pages();

drivers/xen/xenfs/super.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ static int __init xenfs_init(void) 
	if (xen_domain())

		return register_filesystem(&xenfs_type);



	pr_info("not registering filesystem on non-xen platform\n");

	return 0;

}