Author: hselasky Date: Wed Mar 28 17:54:34 2018 New Revision: 331694 URL: https://svnweb.freebsd.org/changeset/base/331694
Log: Swap two instances of regular macros with function macros in the LinuxKPI, to narrow down the substitution scope. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/pci.h Wed Mar 28 17:49:31 2018 (r331693) +++ head/sys/compat/linuxkpi/common/include/linux/pci.h Wed Mar 28 17:54:34 2018 (r331694) @@ -538,7 +538,9 @@ struct msix_entry { * NB: define added to prevent this definition of pci_enable_msix from * clashing with the native FreeBSD version. */ -#define pci_enable_msix linux_pci_enable_msix +#define pci_enable_msix(...) \ + linux_pci_enable_msix(__VA_ARGS__) + static inline int pci_enable_msix(struct pci_dev *pdev, struct msix_entry *entries, int nreq) { @@ -572,7 +574,9 @@ pci_enable_msix(struct pci_dev *pdev, struct msix_entr return (0); } -#define pci_enable_msix_range linux_pci_enable_msix_range +#define pci_enable_msix_range(...) \ + linux_pci_enable_msix_range(__VA_ARGS__) + static inline int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, int minvec, int maxvec) _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"