diff --git a/drivers/gpu/drm/drm_os_freebsd.h b/drivers/gpu/drm/drm_os_freebsd.h index 6350f6944..7a7f75ddd 100644 --- a/drivers/gpu/drm/drm_os_freebsd.h +++ b/drivers/gpu/drm/drm_os_freebsd.h @@ -104,6 +104,7 @@ do { \ ({ __typeof__(*(ptr)) __tmp; \ memcpy(&__tmp, (ptr), sizeof(*(ptr))); __tmp; }) +#if __FreeBSD_version < 0000002 #if _BYTE_ORDER == _LITTLE_ENDIAN /* Taken from linux/include/linux/unaligned/le_struct.h. */ struct __una_u32 { u32 x; } __packed; @@ -138,6 +139,7 @@ get_unaligned_le32(const void *p) return (__get_unaligned_le32((const u8 *)p)); } #endif +#endif #define page_to_phys(x) VM_PAGE_TO_PHYS(x) diff --git a/linuxkpi/gplv2/include/linux/device.h b/linuxkpi/gplv2/include/linux/device.h index da34bb33b..095b46f09 100644 --- a/linuxkpi/gplv2/include/linux/device.h +++ b/linuxkpi/gplv2/include/linux/device.h @@ -7,6 +7,7 @@ #include #include +#if __FreeBSD_version < 0000002 typedef void (*dr_release_t)(struct device *dev, void *res); typedef int (*dr_match_t)(struct device *dev, void *res, void *match_data); @@ -264,5 +265,6 @@ devres_release_group(struct device *dev, void *id) return cnt; } +#endif #endif /* _LINUX_GPLV2_DEVICE_H_ */ diff --git a/linuxkpi/gplv2/include/linux/firmware.h b/linuxkpi/gplv2/include/linux/firmware.h index 34ec486f6..2936286e5 100644 --- a/linuxkpi/gplv2/include/linux/firmware.h +++ b/linuxkpi/gplv2/include/linux/firmware.h @@ -1,3 +1,5 @@ +#include +#if __FreeBSD_version < 0000001 #ifndef _LINUX_FIRMWARE_H #define _LINUX_FIRMWARE_H @@ -50,3 +52,6 @@ int request_firmware_nowait( void release_firmware(const struct linux_firmware *fw); #define firmware linux_firmware #endif +#else +#include_next +#endif diff --git a/linuxkpi/gplv2/include/linux/kconfig.h b/linuxkpi/gplv2/include/linux/kconfig.h index 1c342a3f3..81e223fd9 100644 --- a/linuxkpi/gplv2/include/linux/kconfig.h +++ b/linuxkpi/gplv2/include/linux/kconfig.h @@ -1,3 +1,5 @@ +#include +#if __FreeBSD_version < 0000002 #ifndef __LINUX_KCONFIG_H #define __LINUX_KCONFIG_H #if 0 @@ -53,3 +55,4 @@ (IS_BUILTIN(option) || IS_MODULE(option)) #endif /* __LINUX_KCONFIG_H */ +#endif diff --git a/linuxkpi/gplv2/include/linux/kobject.h b/linuxkpi/gplv2/include/linux/kobject.h index 9be54205e..3b97d455a 100644 --- a/linuxkpi/gplv2/include/linux/kobject.h +++ b/linuxkpi/gplv2/include/linux/kobject.h @@ -3,6 +3,7 @@ #include_next +#if __FreeBSD_version < 0000002 enum kobject_action { KOBJ_ADD, KOBJ_REMOVE, @@ -22,5 +23,6 @@ kobject_uevent_env(struct kobject *kobj __unused, return (0); } +#endif #endif diff --git a/linuxkpi/gplv2/include/linux/pci.h b/linuxkpi/gplv2/include/linux/pci.h index fd193aca5..3727eab1e 100644 --- a/linuxkpi/gplv2/include/linux/pci.h +++ b/linuxkpi/gplv2/include/linux/pci.h @@ -116,7 +116,9 @@ pci_get_domain_bus_and_slot(int domain, unsigned int bus, unsigned int devfn) } #endif +#if __FreeBSD_version < 0000002 void pci_dev_put(struct pci_dev *pdev); +#endif #if __FreeBSD_version < 1300135 static inline bool diff --git a/linuxkpi/gplv2/include/linux/scatterlist.h b/linuxkpi/gplv2/include/linux/scatterlist.h index f6581ea79..f0bb9c98a 100644 --- a/linuxkpi/gplv2/include/linux/scatterlist.h +++ b/linuxkpi/gplv2/include/linux/scatterlist.h @@ -31,6 +31,7 @@ #include_next +#if __FreeBSD_version < 0000002 static inline size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, const void *buf, size_t buflen, off_t offset) @@ -68,6 +69,7 @@ sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, } return (total); } +#endif static inline size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents, diff --git a/linuxkpi/gplv2/include/linux/seqlock.h b/linuxkpi/gplv2/include/linux/seqlock.h index e86351810..30d930009 100644 --- a/linuxkpi/gplv2/include/linux/seqlock.h +++ b/linuxkpi/gplv2/include/linux/seqlock.h @@ -54,7 +54,9 @@ typedef struct seqcount { } seqcount_t; +#if __FreeBSD_version < 0000002 #define lockdep_init_map(a, b, c, d) +#endif static inline void __seqcount_init(seqcount_t *s, const char *name, struct lock_class_key *key) diff --git a/linuxkpi/gplv2/src/linux_device.c b/linuxkpi/gplv2/src/linux_device.c index 650c719db..e9c7f5cd3 100644 --- a/linuxkpi/gplv2/src/linux_device.c +++ b/linuxkpi/gplv2/src/linux_device.c @@ -3,6 +3,7 @@ #undef resource +#if __FreeBSD_version < 0000002 static MALLOC_DEFINE(M_DEVRES, "devres", "Linux compat devres"); static struct devres * @@ -105,6 +106,7 @@ devres_free(void *res) free(dr, M_DEVRES); } } +#endif #if __FreeBSD_version < 1300135 struct pci_dev * @@ -128,6 +130,7 @@ pci_get_bus_and_slot(unsigned int bus, unsigned int devfn) } #endif +#if __FreeBSD_version < 0000002 void pci_dev_put(struct pci_dev *pdev) { @@ -139,6 +142,7 @@ pci_dev_put(struct pci_dev *pdev) free(pdev->bus, M_DEVBUF); free(pdev, M_DEVBUF); } +#endif #if __FreeBSD_version < 1300135 struct pci_dev * diff --git a/linuxkpi/gplv2/src/linux_firmware.c b/linuxkpi/gplv2/src/linux_firmware.c index 92f8462ee..7038bc004 100644 --- a/linuxkpi/gplv2/src/linux_firmware.c +++ b/linuxkpi/gplv2/src/linux_firmware.c @@ -1,4 +1,5 @@ #include +#if __FreeBSD_version < 0000001 #include #include #include @@ -121,3 +122,4 @@ release_firmware(const struct linux_firmware *lkfw) free(__DECONST(void *, lkfw), M_LKPI_FW); firmware_put(fw, 0); } +#endif