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

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
...@@ -343,14 +343,6 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) ...@@ -343,14 +343,6 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
info->cpu = 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 * notify_remote_via_irq - send event to remote end of event channel via irq
* @irq: irq of event channel to send event to * @irq: irq of event channel to send event to
...@@ -1573,7 +1565,6 @@ void xen_irq_resume(void) ...@@ -1573,7 +1565,6 @@ void xen_irq_resume(void)
struct irq_info *info; struct irq_info *info;
/* New event-channel space is not 'live' yet. */ /* New event-channel space is not 'live' yet. */
xen_evtchn_mask_all();
xen_evtchn_resume(); xen_evtchn_resume();
/* No IRQ <-> event-channel mappings. */ /* No IRQ <-> event-channel mappings. */
...@@ -1681,6 +1672,7 @@ module_param(fifo_events, bool, 0); ...@@ -1681,6 +1672,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;
if (fifo_events) if (fifo_events)
ret = xen_evtchn_fifo_init(); ret = xen_evtchn_fifo_init();
...@@ -1692,7 +1684,8 @@ void __init xen_init_IRQ(void) ...@@ -1692,7 +1684,8 @@ void __init xen_init_IRQ(void)
BUG_ON(!evtchn_to_irq); BUG_ON(!evtchn_to_irq);
/* No event channels are 'live' right now. */ /* 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; pirq_needs_eoi = pirq_needs_eoi_flag;
......
...@@ -151,8 +151,8 @@ static unsigned long frontswap_inertia_counter; ...@@ -151,8 +151,8 @@ static unsigned long frontswap_inertia_counter;
static void frontswap_selfshrink(void) static void frontswap_selfshrink(void)
{ {
static unsigned long cur_frontswap_pages; static unsigned long cur_frontswap_pages;
static unsigned long last_frontswap_pages; unsigned long last_frontswap_pages;
static unsigned long tgt_frontswap_pages; unsigned long tgt_frontswap_pages;
last_frontswap_pages = cur_frontswap_pages; last_frontswap_pages = cur_frontswap_pages;
cur_frontswap_pages = frontswap_curr_pages(); cur_frontswap_pages = frontswap_curr_pages();
......
...@@ -87,7 +87,6 @@ static int __init xenfs_init(void) ...@@ -87,7 +87,6 @@ static int __init xenfs_init(void)
if (xen_domain()) if (xen_domain())
return register_filesystem(&xenfs_type); return register_filesystem(&xenfs_type);
pr_info("not registering filesystem on non-xen platform\n");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment