Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+5 -13
+3 -10
drivers/xen/events/events_base.c
··· 343 343 info->cpu = cpu; 344 344 } 345 345 346 - static void xen_evtchn_mask_all(void) 347 - { 348 - unsigned int evtchn; 349 - 350 - for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++) 351 - mask_evtchn(evtchn); 352 - } 353 - 354 346 /** 355 347 * notify_remote_via_irq - send event to remote end of event channel via irq 356 348 * @irq: irq of event channel to send event to ··· 1565 1573 struct irq_info *info; 1566 1574 1567 1575 /* New event-channel space is not 'live' yet. */ 1568 - xen_evtchn_mask_all(); 1569 1576 xen_evtchn_resume(); 1570 1577 1571 1578 /* No IRQ <-> event-channel mappings. */ ··· 1672 1681 void __init xen_init_IRQ(void) 1673 1682 { 1674 1683 int ret = -EINVAL; 1684 + unsigned int evtchn; 1675 1685 1676 1686 if (fifo_events) 1677 1687 ret = xen_evtchn_fifo_init(); ··· 1684 1692 BUG_ON(!evtchn_to_irq); 1685 1693 1686 1694 /* No event channels are 'live' right now. */ 1687 - xen_evtchn_mask_all(); 1695 + for (evtchn = 0; evtchn < xen_evtchn_nr_channels(); evtchn++) 1696 + mask_evtchn(evtchn); 1688 1697 1689 1698 pirq_needs_eoi = pirq_needs_eoi_flag; 1690 1699
+2 -2
drivers/xen/xen-selfballoon.c
··· 151 151 static void frontswap_selfshrink(void) 152 152 { 153 153 static unsigned long cur_frontswap_pages; 154 - static unsigned long last_frontswap_pages; 155 - static unsigned long tgt_frontswap_pages; 154 + unsigned long last_frontswap_pages; 155 + unsigned long tgt_frontswap_pages; 156 156 157 157 last_frontswap_pages = cur_frontswap_pages; 158 158 cur_frontswap_pages = frontswap_curr_pages();
-1
drivers/xen/xenfs/super.c
··· 87 87 if (xen_domain()) 88 88 return register_filesystem(&xenfs_type); 89 89 90 - pr_info("not registering filesystem on non-xen platform\n"); 91 90 return 0; 92 91 } 93 92