Date: Tue, 3 Nov 2015 12:37:55 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290335 - in head/sys/compat/linuxkpi/common/include: asm linux net Message-ID: <201511031237.tA3CbtCa029757@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Tue Nov 3 12:37:55 2015 New Revision: 290335 URL: https://svnweb.freebsd.org/changeset/base/290335 Log: Make all the LinuxKPI include files compile standalone. Sponsored by: Mellanox Technologies Modified: head/sys/compat/linuxkpi/common/include/asm/byteorder.h head/sys/compat/linuxkpi/common/include/asm/types.h head/sys/compat/linuxkpi/common/include/linux/bitops.h head/sys/compat/linuxkpi/common/include/linux/cdev.h head/sys/compat/linuxkpi/common/include/linux/clocksource.h head/sys/compat/linuxkpi/common/include/linux/device.h head/sys/compat/linuxkpi/common/include/linux/idr.h head/sys/compat/linuxkpi/common/include/linux/if_arp.h head/sys/compat/linuxkpi/common/include/linux/if_vlan.h head/sys/compat/linuxkpi/common/include/linux/interrupt.h head/sys/compat/linuxkpi/common/include/linux/io.h head/sys/compat/linuxkpi/common/include/linux/jhash.h head/sys/compat/linuxkpi/common/include/linux/kobject.h head/sys/compat/linuxkpi/common/include/linux/kref.h head/sys/compat/linuxkpi/common/include/linux/module.h head/sys/compat/linuxkpi/common/include/linux/net.h head/sys/compat/linuxkpi/common/include/linux/notifier.h head/sys/compat/linuxkpi/common/include/linux/poll.h head/sys/compat/linuxkpi/common/include/linux/radix-tree.h head/sys/compat/linuxkpi/common/include/linux/rwlock.h head/sys/compat/linuxkpi/common/include/linux/sysfs.h head/sys/compat/linuxkpi/common/include/linux/usb.h head/sys/compat/linuxkpi/common/include/net/if_inet6.h head/sys/compat/linuxkpi/common/include/net/ipv6.h head/sys/compat/linuxkpi/common/include/net/netevent.h Modified: head/sys/compat/linuxkpi/common/include/asm/byteorder.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/byteorder.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/asm/byteorder.h Tue Nov 3 12:37:55 2015 (r290335) @@ -86,7 +86,7 @@ #define swab64 bswap64 static inline void -be16_add_cpu(u16 *var, u16 val) +be16_add_cpu(uint16_t *var, uint16_t val) { *var = cpu_to_be16(be16_to_cpu(*var) + val); } Modified: head/sys/compat/linuxkpi/common/include/asm/types.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/types.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/asm/types.h Tue Nov 3 12:37:55 2015 (r290335) @@ -33,6 +33,8 @@ #ifdef _KERNEL +#include <sys/types.h> + typedef uint8_t u8; typedef uint8_t __u8; typedef uint16_t u16; Modified: head/sys/compat/linuxkpi/common/include/linux/bitops.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/bitops.h Tue Nov 3 12:37:55 2015 (r290335) @@ -33,6 +33,7 @@ #include <sys/types.h> #include <sys/systm.h> +#include <sys/errno.h> #define BIT(nr) (1UL << (nr)) #ifdef __LP64__ Modified: head/sys/compat/linuxkpi/common/include/linux/cdev.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/cdev.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/cdev.h Tue Nov 3 12:37:55 2015 (r290335) @@ -32,6 +32,7 @@ #define _LINUX_CDEV_H_ #include <linux/kobject.h> +#include <linux/sysfs.h> #include <linux/kdev_t.h> #include <linux/list.h> Modified: head/sys/compat/linuxkpi/common/include/linux/clocksource.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/clocksource.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/clocksource.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,6 +31,8 @@ #ifndef _LINUX_CLOCKSOURCE_H #define _LINUX_CLOCKSOURCE_H +#include <asm/types.h> + /* clocksource cycle base type */ typedef u64 cycle_t; Modified: head/sys/compat/linuxkpi/common/include/linux/device.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/device.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/device.h Tue Nov 3 12:37:55 2015 (r290335) @@ -33,6 +33,7 @@ #include <linux/types.h> #include <linux/kobject.h> +#include <linux/sysfs.h> #include <linux/list.h> #include <linux/compiler.h> #include <linux/types.h> Modified: head/sys/compat/linuxkpi/common/include/linux/idr.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/idr.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/idr.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,7 +31,11 @@ #ifndef _LINUX_IDR_H_ #define _LINUX_IDR_H_ -#include <sys/kernel.h> +#include <sys/param.h> +#include <sys/lock.h> +#include <sys/mutex.h> + +#include <linux/types.h> #define IDR_BITS 5 #define IDR_SIZE (1 << IDR_BITS) Modified: head/sys/compat/linuxkpi/common/include/linux/if_arp.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/if_arp.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/if_arp.h Tue Nov 3 12:37:55 2015 (r290335) @@ -30,6 +30,8 @@ */ #ifndef _LINUX_IF_ARP_H_ #define _LINUX_IF_ARP_H_ +#include <sys/param.h> +#include <sys/types.h> #include <sys/socket.h> #include <net/if_arp.h> #endif /* _LINUX_IF_ARP_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/if_vlan.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/if_vlan.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/if_vlan.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,6 +31,7 @@ #ifndef _LINUX_IF_VLAN_H_ #define _LINUX_IF_VLAN_H_ +#include <sys/types.h> #include <sys/socket.h> #include <net/if.h> #include <net/ethernet.h> Modified: head/sys/compat/linuxkpi/common/include/linux/interrupt.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/interrupt.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/interrupt.h Tue Nov 3 12:37:55 2015 (r290335) @@ -61,7 +61,7 @@ _irq_rid(struct device *dev, int irq) return irq - dev->msix + 1; } -static void +static inline void _irq_handler(void *ent) { struct irq_ent *irqe; Modified: head/sys/compat/linuxkpi/common/include/linux/io.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/io.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/io.h Tue Nov 3 12:37:55 2015 (r290335) @@ -33,6 +33,7 @@ #include <machine/vm.h> #include <sys/endian.h> +#include <sys/types.h> static inline uint32_t __raw_readl(const volatile void *addr) Modified: head/sys/compat/linuxkpi/common/include/linux/jhash.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/jhash.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/jhash.h Tue Nov 3 12:37:55 2015 (r290335) @@ -1,6 +1,8 @@ #ifndef _LINUX_JHASH_H_ #define _LINUX_JHASH_H_ +#include <asm/types.h> + /* jhash.h: Jenkins hash support. * * Copyright (C) 1996 Bob Jenkins (bob_jenkins@burtleburtle.net) Modified: head/sys/compat/linuxkpi/common/include/linux/kobject.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kobject.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/kobject.h Tue Nov 3 12:37:55 2015 (r290335) @@ -59,6 +59,20 @@ struct kobject { extern struct kobject *mm_kobj; +struct attribute { + const char *name; + struct module *owner; + mode_t mode; +}; + +struct kobj_attribute { + struct attribute attr; + ssize_t (*show)(struct kobject *kobj, struct kobj_attribute *attr, + char *buf); + ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr, + const char *buf, size_t count); +}; + static inline void kobject_init(struct kobject *kobj, struct kobj_type *ktype) { @@ -155,17 +169,4 @@ int kobject_set_name(struct kobject *kob int kobject_init_and_add(struct kobject *kobj, struct kobj_type *ktype, struct kobject *parent, const char *fmt, ...); -/* sysfs.h calles for 'kobject' which is defined here, - * so we need to add the include only after the 'kobject' def. - */ -#include <linux/sysfs.h> - -struct kobj_attribute { - struct attribute attr; - ssize_t (*show)(struct kobject *kobj, struct kobj_attribute *attr, - char *buf); - ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr, - const char *buf, size_t count); -}; - #endif /* _LINUX_KOBJECT_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/kref.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kref.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/kref.h Tue Nov 3 12:37:55 2015 (r290335) @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/refcount.h> +#include <linux/compiler.h> #include <asm/atomic.h> struct kref { Modified: head/sys/compat/linuxkpi/common/include/linux/module.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/module.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/module.h Tue Nov 3 12:37:55 2015 (r290335) @@ -38,6 +38,7 @@ #include <linux/list.h> #include <linux/compiler.h> #include <linux/kobject.h> +#include <linux/sysfs.h> #include <linux/moduleparam.h> #include <linux/slab.h> Modified: head/sys/compat/linuxkpi/common/include/linux/net.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/net.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/net.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,9 +31,13 @@ #ifndef _LINUX_NET_H_ #define _LINUX_NET_H_ +#include <sys/types.h> +#include <sys/malloc.h> +#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/errno.h> static inline int sock_create_kern(int family, int type, int proto, struct socket **res) Modified: head/sys/compat/linuxkpi/common/include/linux/notifier.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/notifier.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/notifier.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,6 +31,7 @@ #ifndef _LINUX_NOTIFIER_H_ #define _LINUX_NOTIFIER_H_ +#include <sys/types.h> #include <sys/eventhandler.h> /* Modified: head/sys/compat/linuxkpi/common/include/linux/poll.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/poll.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/poll.h Tue Nov 3 12:37:55 2015 (r290335) @@ -34,11 +34,14 @@ #include <sys/poll.h> #include <sys/fcntl.h> +#include <linux/wait.h> +#include <linux/file.h> + typedef struct poll_table_struct { } poll_table; static inline void -poll_wait(struct file *filp, wait_queue_head_t *wait_address, poll_table *p) +poll_wait(struct linux_file *filp, wait_queue_head_t *wait_address, poll_table *p) { selrecord(curthread, &filp->f_selinfo); } Modified: head/sys/compat/linuxkpi/common/include/linux/radix-tree.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/radix-tree.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/radix-tree.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,6 +31,8 @@ #ifndef _LINUX_RADIX_TREE_H_ #define _LINUX_RADIX_TREE_H_ +#include <linux/types.h> + #define RADIX_TREE_MAP_SHIFT 6 #define RADIX_TREE_MAP_SIZE (1 << RADIX_TREE_MAP_SHIFT) #define RADIX_TREE_MAP_MASK (RADIX_TREE_MAP_SIZE - 1) Modified: head/sys/compat/linuxkpi/common/include/linux/rwlock.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/rwlock.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/rwlock.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,6 +31,7 @@ #ifndef _LINUX_RWLOCK_H_ #define _LINUX_RWLOCK_H_ +#include <sys/types.h> #include <sys/lock.h> #include <sys/rwlock.h> Modified: head/sys/compat/linuxkpi/common/include/linux/sysfs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/sysfs.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/sysfs.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,13 +31,11 @@ #ifndef _LINUX_SYSFS_H_ #define _LINUX_SYSFS_H_ +#include <sys/types.h> #include <sys/sysctl.h> +#include <sys/errno.h> -struct attribute { - const char *name; - struct module *owner; - mode_t mode; -}; +#include <linux/kobject.h> struct sysfs_ops { ssize_t (*show)(struct kobject *, struct attribute *, char *); Modified: head/sys/compat/linuxkpi/common/include/linux/usb.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/usb.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/linux/usb.h Tue Nov 3 12:37:55 2015 (r290335) @@ -28,6 +28,15 @@ #ifndef _USB_COMPAT_LINUX_H #define _USB_COMPAT_LINUX_H +#include <sys/types.h> +#include <sys/param.h> +#include <sys/proc.h> +#include <sys/condvar.h> + +#include <dev/usb/usb.h> +#include <dev/usb/usbdi.h> +#include <dev/usb/usbdi_util.h> + struct usb_device; struct usb_interface; struct usb_driver; Modified: head/sys/compat/linuxkpi/common/include/net/if_inet6.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/net/if_inet6.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/net/if_inet6.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,6 +31,11 @@ #ifndef _NET_IF_INET6_H_ #define _NET_IF_INET6_H_ +#include <sys/types.h> +#include <netinet/in.h> + +#include <asm/types.h> + static inline void ipv6_eth_mc_map(const struct in6_addr *addr, char *buf) { /* Modified: head/sys/compat/linuxkpi/common/include/net/ipv6.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/net/ipv6.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/net/ipv6.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,13 +31,14 @@ #ifndef _LINUX_NET_IPV6_H_ #define _LINUX_NET_IPV6_H_ -#include "opt_inet6.h" +#include <sys/types.h> +#include <netinet/in.h> +#include <linux/types.h> #define ipv6_addr_loopback IN6_IS_ADDR_LOOPBACK #define ipv6_addr_copy(dst, src) \ memcpy((dst), (src), sizeof(struct in6_addr)) -#ifdef INET6 static inline void ipv6_ib_mc_map(const struct in6_addr *addr, const unsigned char *broadcast, char *buf) @@ -57,7 +58,6 @@ ipv6_ib_mc_map(const struct in6_addr *ad buf[9] = broadcast[9]; memcpy(&buf[10], &addr->s6_addr[6], 10); } -#endif static inline void __ipv6_addr_set_half(__be32 *addr, __be32 wh, __be32 wl) Modified: head/sys/compat/linuxkpi/common/include/net/netevent.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/net/netevent.h Tue Nov 3 10:34:26 2015 (r290334) +++ head/sys/compat/linuxkpi/common/include/net/netevent.h Tue Nov 3 12:37:55 2015 (r290335) @@ -31,7 +31,10 @@ #ifndef _LINUX_NET_NETEVENT_H_ #define _LINUX_NET_NETEVENT_H_ -#include <netinet/if_ether.h> +#include <sys/types.h> +#include <sys/eventhandler.h> + +#include <linux/notifier.h> enum netevent_notif_type { NETEVENT_NEIGH_UPDATE = 0,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511031237.tA3CbtCa029757>