Re: linux-next: Tree for Oct 30 [drivers/cxl/core/cxl_core.ko]

[Dan Williams <dan.j.williams@intel.com>]

Thorsten Leemhuis wrote:
> [CCing the CXL maintainers]
> 
> On 31.10.23 06:04, Randy Dunlap wrote:
> > On 10/29/23 22:33, Stephen Rothwell wrote:
> >>
> >> Please do not add any material not destined to be merged before v6.7-rc1
> >> into your linux-next included branches until after v6.7-rc1 has been
> >> released.
> >>
> >> Changes since 20231027:
> > 
> > when CONFIG_ACPI is not set (on various ARCH):
> > 
> > ERROR: modpost: "pci_print_aer" [drivers/cxl/core/cxl_core.ko] undefined!
> > 
> > Already fixed?
> 
> Doesn't seem so, I saw that yesterday and today in my ppc64le builds for
> Fedora (based on the Fedora rawhide config). Build log, in case anyone
> cares:
> https://copr-be.cloud.fedoraproject.org/results/@kernel-vanilla/next/fedora-38-ppc64le/06583955-next-next-all/builder-live.log.gz
> 
> Seems 0day ran into this, too:
> 
> https://lore.kernel.org/all/202310281921.W9lzomPk-lkp@intel.com/
> https://lore.kernel.org/all/202310290131.Z10R00pk-lkp@intel.com/
> https://lore.kernel.org/all/202310302206.Pkr5eBDi-lkp@intel.com/
> https://lore.kernel.org/all/202310310457.5LusQqF6-lkp@intel.com/

Yes, apologies for the thrash. This fixes it for me. I will append this
to the cxl/next branch:

diff --git a/include/linux/aer.h b/include/linux/aer.h
index f6ea2f57d808..3db310c19ab7 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -43,16 +43,20 @@ struct aer_capability_regs {
 #if defined(CONFIG_PCIEAER)
 int pci_aer_clear_nonfatal_status(struct pci_dev *dev);
 int pcie_aer_is_native(struct pci_dev *dev);
+void pci_print_aer(struct pci_dev *dev, int aer_severity,
+                   struct aer_capability_regs *aer);
 #else
 static inline int pci_aer_clear_nonfatal_status(struct pci_dev *dev)
 {
        return -EINVAL;
 }
 static inline int pcie_aer_is_native(struct pci_dev *dev) { return 0; }
+static inline void pci_print_aer(struct pci_dev *dev, int aer_severity,
+                                struct aer_capability_regs *aer)
+{
+}
 #endif
 
-void pci_print_aer(struct pci_dev *dev, int aer_severity,
-                   struct aer_capability_regs *aer);
 int cper_severity_to_aer(int cper_severity);
 void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn,
                       int severity, struct aer_capability_regs *aer_regs);