Merge tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

torvalds · torvalds · commit fa33adcaf8af · 2025-06-27T20:17:48.000-07:00
Pull PCI fix from Bjorn Helgaas:

 - Fix a PTM debugfs build error with CONFIG_DEBUG_FS=n &amp;&amp;
   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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ bool pcie_ptm_enabled(struct pci_dev *dev)`
`254`	`254`	`}`
`255`	`255`	`EXPORT_SYMBOL(pcie_ptm_enabled);`
`256`	`256`
	`257`	`+#if IS_ENABLED(CONFIG_DEBUG_FS)`
`257`	`258`	`static ssize_t context_update_write(struct file file, const char __user ubuf,`
`258`	`259`	`size_t count, loff_t *ppos)`
`259`	`260`	`{`
`@@ -552,3 +553,4 @@ void pcie_ptm_destroy_debugfs(struct pci_ptm_debugfs *ptm_debugfs)`
`552`	`553`	`debugfs_remove_recursive(ptm_debugfs->debugfs);`
`553`	`554`	`}`
`554`	`555`	`EXPORT_SYMBOL_GPL(pcie_ptm_destroy_debugfs);`
	`556`	`+#endif`