Commit fa33adca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7abdafd2 5aa326a6

drivers/pci/pcie/ptm.c

+2 −0
Original line number Diff line number Diff line
@@ -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