Author: markj Date: Sun Jun 18 16:43:57 2017 New Revision: 320072 URL: https://svnweb.freebsd.org/changeset/base/320072
Log: Avoid including list.h in LinuxKPI headers. list.h includes a number of FreeBSD headers as a workaround for the LIST_HEAD name collision. To reduce pollution, avoid including list.h in commonly used headers when it is not explicitly needed. Reviewed by: hselasky MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D11249 Modified: head/sys/compat/linuxkpi/common/include/linux/completion.h head/sys/compat/linuxkpi/common/include/linux/kernel.h head/sys/compat/linuxkpi/common/include/linux/kobject.h head/sys/compat/linuxkpi/common/include/linux/mm_types.h head/sys/compat/linuxkpi/common/include/linux/sched.h head/sys/contrib/rdma/krping/krping.c head/sys/ofed/drivers/infiniband/core/fmr_pool.c head/sys/ofed/drivers/infiniband/core/iwcm.c head/sys/ofed/drivers/infiniband/core/umem.c head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h Modified: head/sys/compat/linuxkpi/common/include/linux/completion.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/completion.h Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/compat/linuxkpi/common/include/linux/completion.h Sun Jun 18 16:43:57 2017 (r320072) @@ -32,7 +32,6 @@ #define _LINUX_COMPLETION_H_ #include <linux/errno.h> -#include <linux/wait.h> struct completion { unsigned int done; Modified: head/sys/compat/linuxkpi/common/include/linux/kernel.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kernel.h Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/compat/linuxkpi/common/include/linux/kernel.h Sun Jun 18 16:43:57 2017 (r320072) @@ -49,7 +49,6 @@ #include <linux/sched.h> #include <linux/types.h> #include <linux/jiffies.h> -#include <linux/wait.h> #include <linux/log2.h> #include <asm/byteorder.h> Modified: head/sys/compat/linuxkpi/common/include/linux/kobject.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kobject.h Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/compat/linuxkpi/common/include/linux/kobject.h Sun Jun 18 16:43:57 2017 (r320072) @@ -35,6 +35,7 @@ #include <linux/kernel.h> #include <linux/kref.h> +#include <linux/list.h> #include <linux/slab.h> struct kobject; Modified: head/sys/compat/linuxkpi/common/include/linux/mm_types.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/mm_types.h Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/compat/linuxkpi/common/include/linux/mm_types.h Sun Jun 18 16:43:57 2017 (r320072) @@ -30,7 +30,6 @@ #define _LINUX_MM_TYPES_H_ #include <linux/types.h> -#include <linux/list.h> #include <linux/page.h> #include <linux/rwsem.h> Modified: head/sys/compat/linuxkpi/common/include/linux/sched.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/sched.h Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/compat/linuxkpi/common/include/linux/sched.h Sun Jun 18 16:43:57 2017 (r320072) @@ -37,7 +37,6 @@ #include <sys/sched.h> #include <sys/sleepqueue.h> -#include <linux/list.h> #include <linux/compat.h> #include <linux/completion.h> #include <linux/pid.h> Modified: head/sys/contrib/rdma/krping/krping.c ============================================================================== --- head/sys/contrib/rdma/krping/krping.c Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/contrib/rdma/krping/krping.c Sun Jun 18 16:43:57 2017 (r320072) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <linux/device.h> #include <linux/pci.h> #include <linux/sched.h> +#include <linux/wait.h> #include <asm/atomic.h> Modified: head/sys/ofed/drivers/infiniband/core/fmr_pool.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/fmr_pool.c Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/ofed/drivers/infiniband/core/fmr_pool.c Sun Jun 18 16:43:57 2017 (r320072) @@ -37,6 +37,7 @@ #include <linux/slab.h> #include <linux/jhash.h> #include <linux/kthread.h> +#include <linux/wait.h> #include <rdma/ib_fmr_pool.h> Modified: head/sys/ofed/drivers/infiniband/core/iwcm.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/iwcm.c Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/ofed/drivers/infiniband/core/iwcm.c Sun Jun 18 16:43:57 2017 (r320072) @@ -50,6 +50,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/string.h> +#include <linux/wait.h> #include <netinet/tcp.h> #include <sys/mutex.h> Modified: head/sys/ofed/drivers/infiniband/core/umem.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/umem.c Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/ofed/drivers/infiniband/core/umem.c Sun Jun 18 16:43:57 2017 (r320072) @@ -40,6 +40,7 @@ #include <linux/dma-attrs.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/wait.h> #include <sys/priv.h> #include <sys/resourcevar.h> #include <sys/vmmeter.h> Modified: head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h ============================================================================== --- head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h Sun Jun 18 12:59:43 2017 (r320071) +++ head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h Sun Jun 18 16:43:57 2017 (r320072) @@ -45,6 +45,7 @@ #include <linux/mutex.h> #include <linux/list.h> #include <linux/semaphore.h> +#include <linux/wait.h> #include "mthca_provider.h" #include "mthca_doorbell.h" _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
