diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-18 00:20:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-18 00:20:54 +0300 |
| commit | a4eff16c54886c11972d6396ce8447b99e097343 (patch) | |
| tree | eae80ceb9c2827946f31e4bddc6f9c3a9da7b17a /drivers | |
| parent | 0cbeafb245ca568bc0765645aa64f0451b716657 (diff) | |
| parent | b0e551313ebde17764f3a5ed273df524d1e7e690 (diff) | |
| download | linux-a4eff16c54886c11972d6396ce8447b99e097343.tar.xz | |
Merge branch 'parisc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parsic updates from Helge Deller:
"This patchset includes two major fixes which are both scheduled for
stable:
First, __ARCH_SI_PREAMBLE_SIZE was defined with a wrong value.
Second, huge page pte and TLB changes needed protection with a
spinlock. Other than that there are just some trivial optimizations
and cleanups"
* 'parisc-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Protect huge page pte changes with spinlocks
parisc: Imporove debug info about space registers and TLB configuration
parisc: Drop parisc-specific NSIGTRAP define
parisc: Fix __ARCH_SI_PREAMBLE_SIZE
parisc: Reduce overhead of parisc_requires_coherency()
parisc: Initialize PCI bridge cache line and default latency
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/dino.c | 4 | ||||
| -rw-r--r-- | drivers/parisc/lba_pci.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index a0580afe1713..1133b5cc88ca 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -599,8 +599,10 @@ dino_fixup_bus(struct pci_bus *bus) ** P2PB's only have 2 BARs, no IRQs. ** I'd like to just ignore them for now. */ - if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) + if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { + pcibios_init_bridge(dev); continue; + } /* null out the ROM resource if there is one (we don't * care about an expansion rom on parisc, since it diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 42844c2bc065..2ec2aef4d211 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -790,8 +790,10 @@ lba_fixup_bus(struct pci_bus *bus) /* ** P2PB's have no IRQs. ignore them. */ - if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) + if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { + pcibios_init_bridge(dev); continue; + } /* Adjust INTERRUPT_LINE for this dev */ iosapic_fixup_irq(ldev->iosapic_obj, dev); |