diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-27 20:17:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-27 20:17:48 -0700 |
| commit | fa33adcaf8af147f4238c84d76a316a47e43e091 (patch) | |
| tree | b8d7a7bfce193377b556eab1a4a77736f3b69350 | |
| parent | Merge tag 'drm-fixes-2025-06-28' of https://gitlab.freedesktop.org/drm/kernel (diff) | |
| parent | PCI/PTM: Build debugfs code only if CONFIG_DEBUG_FS is enabled (diff) | |
| download | wireguard-linux-fa33adcaf8af147f4238c84d76a316a47e43e091.tar.xz wireguard-linux-fa33adcaf8af147f4238c84d76a316a47e43e091.zip | |
Merge tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull PCI fix from Bjorn Helgaas:
- Fix a PTM debugfs build error with CONFIG_DEBUG_FS=n &&
CONFIG_PCIE_PTM=y (Manivannan Sadhasivam)
* tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
PCI/PTM: Build debugfs code only if CONFIG_DEBUG_FS is enabled
| -rw-r--r-- | drivers/pci/pcie/ptm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c index ee5f615a9023..4bd73f038ffb 100644 --- a/drivers/pci/pcie/ptm.c +++ b/drivers/pci/pcie/ptm.c @@ -254,6 +254,7 @@ bool pcie_ptm_enabled(struct pci_dev *dev) } EXPORT_SYMBOL(pcie_ptm_enabled); +#if IS_ENABLED(CONFIG_DEBUG_FS) static ssize_t context_update_write(struct file *file, const char __user *ubuf, size_t count, loff_t *ppos) { @@ -552,3 +553,4 @@ void pcie_ptm_destroy_debugfs(struct pci_ptm_debugfs *ptm_debugfs) debugfs_remove_recursive(ptm_debugfs->debugfs); } EXPORT_SYMBOL_GPL(pcie_ptm_destroy_debugfs); +#endif |