Commit 9479f0f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.4-rc1-tag' of... 

Merge tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull xen fixes from Konrad Rzeszutek Wilk:
 "Two fixes for regressions:
   * one is a workaround that will be removed in v3.5 with proper fix in
     the tip/x86 tree,
   * the other is to fix drivers to load on PV (a previous patch made
     them only load in PVonHVM mode).

  The rest are just minor fixes in the various drivers and some cleanup
  in the core code."

* tag 'stable/for-linus-3.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/pcifront: avoid pci_frontend_enable_msix() falsely returning success
  xen/pciback: fix XEN_PCI_OP_enable_msix result
  xen/smp: Remove unnecessary call to smp_processor_id()
  xen/x86: Workaround 'x86/ioapic: Add register level checks to detect bogus io-apic entries'
  xen: only check xen_platform_pci_unplug if hvm
parents 1ddca057 f09d8432

arch/x86/xen/mmu.c

+3 −1
Original line number Diff line number Diff line
@@ -1859,6 +1859,7 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, 
#endif	/* CONFIG_X86_64 */



static unsigned char dummy_mapping[PAGE_SIZE] __page_aligned_bss;

static unsigned char fake_ioapic_mapping[PAGE_SIZE] __page_aligned_bss;



static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)

{
@@ -1899,7 +1900,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) 
		 * We just don't map the IO APIC - all access is via

		 * hypercalls.  Keep the address in the pte for reference.

		 */

		pte = pfn_pte(PFN_DOWN(__pa(dummy_mapping)), PAGE_KERNEL);

		pte = pfn_pte(PFN_DOWN(__pa(fake_ioapic_mapping)), PAGE_KERNEL);

		break;

#endif
@@ -2064,6 +2065,7 @@ void __init xen_init_mmu_ops(void) 
	pv_mmu_ops = xen_mmu_ops;



	memset(dummy_mapping, 0xff, PAGE_SIZE);

	memset(fake_ioapic_mapping, 0xfd, PAGE_SIZE);

}



/* Protected by xen_reservation_lock. */

arch/x86/xen/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) 


static void __cpuinit cpu_bringup(void)

{

	int cpu = smp_processor_id();

	int cpu;



	cpu_init();

	touch_softlockup_watchdog();

drivers/block/xen-blkfront.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static int __init xlblk_init(void) 
	if (!xen_domain())

		return -ENODEV;



	if (!xen_platform_pci_unplug)

	if (xen_hvm_domain() && !xen_platform_pci_unplug)

		return -ENODEV;



	if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {

drivers/net/xen-netfront.c

+1 −1
Original line number Diff line number Diff line
@@ -1965,7 +1965,7 @@ static int __init netif_init(void) 
	if (xen_initial_domain())

		return 0;



	if (!xen_platform_pci_unplug)

	if (xen_hvm_domain() && !xen_platform_pci_unplug)

		return -ENODEV;



	printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");

drivers/pci/xen-pcifront.c

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, 
		} else {

			printk(KERN_DEBUG "enable msix get value %x\n",

				op.value);

			err = op.value;

		}

	} else {

		dev_err(&dev->dev, "enable msix get err %x\n", err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE