On Tue, Jan 26, 2016 at 03:26:36PM +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Tue Jan 26 15:26:35 2016 > New Revision: 294839 > URL: https://svnweb.freebsd.org/changeset/base/294839 > > Log: > Update and add various macros to the LinuxKPI and resolve a macro > redefinition issue in the cxgb driver. > > MFC after: 1 week > Sponsored by: Mellanox Technologies > Reviewed by: np @
^^^^ only the cxgb_osdep.h part. Regards, Navdeep > > Modified: > head/sys/compat/linuxkpi/common/include/asm/atomic.h > head/sys/compat/linuxkpi/common/include/linux/clocksource.h > head/sys/compat/linuxkpi/common/include/linux/completion.h > head/sys/compat/linuxkpi/common/include/linux/gfp.h > head/sys/compat/linuxkpi/common/include/linux/kernel.h > head/sys/dev/cxgb/cxgb_osdep.h > > <snip> > > Modified: head/sys/dev/cxgb/cxgb_osdep.h > ============================================================================== > --- head/sys/dev/cxgb/cxgb_osdep.h Tue Jan 26 15:22:04 2016 > (r294838) > +++ head/sys/dev/cxgb/cxgb_osdep.h Tue Jan 26 15:26:35 2016 > (r294839) > @@ -231,7 +231,9 @@ static const int debug_flags = DBG_RX; > #define le16_to_cpu(x) le16toh(x) > #define cpu_to_le32(x) htole32(x) > #define swab32(x) bswap32(x) > -#define simple_strtoul strtoul > +#ifndef simple_strtoul > +#define simple_strtoul(...) strtoul(__VA_ARGS__) > +#endif > > > #ifndef LINUX_TYPES_DEFINED > _______________________________________________ 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"
