diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-25 17:31:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-25 17:31:59 -0700 |
| commit | 267560874cb0189f28e7ae6dfbc8e98b8848be98 (patch) | |
| tree | 649702ebe9faf5679d6e81c08dc07c4fcb04a2dd /drivers/xen | |
| parent | 4ae4614712e0a354c9e6c286c0db1612246766ce (diff) | |
| parent | c96aae1f7f393387d160211f60398d58463a7e65 (diff) | |
| download | linux-267560874cb0189f28e7ae6dfbc8e98b8848be98.tar.gz linux-267560874cb0189f28e7ae6dfbc8e98b8848be98.tar.bz2 linux-267560874cb0189f28e7ae6dfbc8e98b8848be98.zip | |
Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull three xen bug-fixes from Konrad Rzeszutek Wilk:
- Revert the kexec fix which caused on non-kexec shutdowns a race.
- Reuse existing P2M leafs - instead of requiring to allocate a large
area of bootup virtual address estate.
- Fix a one-off error when adding PFNs for balloon pages.
* tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.
xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID.
Revert "xen PVonHVM: move shared_info to MMIO before kexec"
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/platform-pci.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c index d4c50d63acbc..97ca359ae2bd 100644 --- a/drivers/xen/platform-pci.c +++ b/drivers/xen/platform-pci.c @@ -101,19 +101,6 @@ static int platform_pci_resume(struct pci_dev *pdev) return 0; } -static void __devinit prepare_shared_info(void) -{ -#ifdef CONFIG_KEXEC - unsigned long addr; - struct shared_info *hvm_shared_info; - - addr = alloc_xen_mmio(PAGE_SIZE); - hvm_shared_info = ioremap(addr, PAGE_SIZE); - memset(hvm_shared_info, 0, PAGE_SIZE); - xen_hvm_prepare_kexec(hvm_shared_info, addr >> PAGE_SHIFT); -#endif -} - static int __devinit platform_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -151,8 +138,6 @@ static int __devinit platform_pci_init(struct pci_dev *pdev, platform_mmio = mmio_addr; platform_mmiolen = mmio_len; - prepare_shared_info(); - if (!xen_have_vector_callback) { ret = xen_allocate_irq(pdev); if (ret) { |