diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2021-10-26 16:20:04 +0300 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2021-10-26 16:20:04 +0300 |
| commit | e7456f7adbaac0ec15a61b4b3a172cc4241ebb34 (patch) | |
| tree | c25c2e74a0c4ca658cc7766501709762e040c057 /arch/s390/include | |
| parent | 1a446b24730e78777078c4e2d24ba71dbf06a213 (diff) | |
| parent | 8b7216439e2e2128f6f1a19ad4b6be94d8b0e23d (diff) | |
| download | linux-e7456f7adbaac0ec15a61b4b3a172cc4241ebb34.tar.xz | |
Merge branch 'fixes' into features
pci and string functions changes on features depend on changes from the
fixes branch.
* fixes:
s390: add Alexander Gordeev as reviewer
s390: fix strrchr() implementation
vfio-ccw: step down as maintainer
KVM: s390: remove myself as reviewer
s390/pci: fix zpci_zdev_put() on reserve
bpf, s390: Fix potential memory leak about jit_data
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index e4803ec51110..6b3c366af78e 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -207,6 +207,8 @@ int zpci_enable_device(struct zpci_dev *); int zpci_disable_device(struct zpci_dev *); int zpci_scan_configured_device(struct zpci_dev *zdev, u32 fh); int zpci_deconfigure_device(struct zpci_dev *zdev); +void zpci_device_reserved(struct zpci_dev *zdev); +bool zpci_is_device_configured(struct zpci_dev *zdev); int zpci_register_ioat(struct zpci_dev *, u8, u64, u64, u64); int zpci_unregister_ioat(struct zpci_dev *, u8); |