diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-13 18:18:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-13 18:18:06 +0100 |
| commit | be427a88a3dc2de30688b08d078f4f4c1bb035d6 (patch) | |
| tree | 8c3b1632ec18c5022cde45dc4ed92759779b1e50 /include | |
| parent | Merge tag 'riscv-for-linus-5.16-mw1' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | s390/cio: check the subchannel validity for dev_busid (diff) | |
| download | linux-be427a88a3dc2de30688b08d078f4f4c1bb035d6.tar.xz linux-be427a88a3dc2de30688b08d078f4f4c1bb035d6.zip | |
Merge tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Vasily Gorbik:
- Add PCI automatic error recovery.
- Fix tape driver timer initialization broken during timers api
cleanup.
- Fix bogus CPU measurement counters values on CPUs offlining.
- Check the validity of subchanel before reading other fields in the
schib in cio code.
* tag 's390-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/cio: check the subchannel validity for dev_busid
s390/cpumf: cpum_cf PMU displays invalid value after hotplug remove
s390/tape: fix timer initialization in tape_std_assign()
s390/pci: implement minimal PCI error recovery
PCI: Export pci_dev_lock()
s390/pci: implement reset_slot for hotplug slot
s390/pci: refresh function handle in iomap
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 138d764c1c35..0b9d58098c8b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1666,6 +1666,7 @@ void pci_cfg_access_lock(struct pci_dev *dev); bool pci_cfg_access_trylock(struct pci_dev *dev); void pci_cfg_access_unlock(struct pci_dev *dev); +void pci_dev_lock(struct pci_dev *dev); int pci_dev_trylock(struct pci_dev *dev); void pci_dev_unlock(struct pci_dev *dev); |