On 08 Oct 2014, at 09:30 , Kashyap D Desai <kade...@freebsd.org> wrote:
> Author: kadesai > Date: Wed Oct 8 09:30:35 2014 > New Revision: 272738 > URL: https://svnweb.freebsd.org/changeset/base/272738 > > Log: > Fix the minor svn add issue. $FreeBSD$ expands at the time of > snv add, so I have added $FreeBSD$ as comment. > > This commit is contininous of last mrsas commit, so that compilation > does not break. > So i386.XEN seems broken when I do a universe currently; could you check? In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:516:3: error: typedef redefinition with different types ('struct atomic_t' vs 'struct atomic_t') } atomic_t; ^ ./machine/xen/xen-os.h:157:42: note: previous definition is here typedef struct { volatile int counter; } atomic_t; ^ In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:2580:1: error: redefinition of 'clear_bit' clear_bit(int b, volatile void *p) ^ ./machine/xen/xen-os.h:258:24: note: previous definition is here static __inline__ void clear_bit(int nr, volatile void * addr) ^ In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:2586:1: error: redefinition of 'set_bit' set_bit(int b, volatile void *p) ^ ./machine/xen/xen-os.h:240:24: note: previous definition is here static __inline__ void set_bit(int nr, volatile void * addr) ^ In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:2592:1: error: expected ')' test_bit(int b, volatile void *p) ^ ./machine/xen/xen-os.h:225:27: note: expanded from macro 'test_bit' (__builtin_constant_p(nr) ? \ ^ @/dev/mrsas/mrsas.h:2592:1: note: to match this '(' ./machine/xen/xen-os.h:224:27: note: expanded from macro 'test_bit' #define test_bit(nr,addr) \ ^ In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:2592:1: error: static declaration of '__builtin_constant_p' follows non-static declaration test_bit(int b, volatile void *p) ^ ./machine/xen/xen-os.h:225:2: note: expanded from macro 'test_bit' (__builtin_constant_p(nr) ? \ ^ ./x86/endian.h:122:10: note: previous implicit declaration is here return (__bswap64_gen(_x)); ^ ./x86/endian.h:70:16: note: expanded from macro '__bswap64_gen' (((__uint64_t)__bswap32((x) & 0xffffffff) << 32) | __bswap32((x) >> 32)) ^ ./x86/endian.h:77:3: note: expanded from macro '__bswap32' (__builtin_constant_p(x) ? \ ^ In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:2592:1: error: definition of builtin function '__builtin_constant_p' test_bit(int b, volatile void *p) ^ ./machine/xen/xen-os.h:225:2: note: expanded from macro 'test_bit' (__builtin_constant_p(nr) ? \ ^ In file included from /scratch/tmp/bz/head.svn/sys/modules/mrsas/mrsas_linux/../../../dev/mrsas/mrsas_linux.c:66: @/dev/mrsas/mrsas.h:2594:26: error: use of undeclared identifier 'p' return ((volatile int *)p)[b >> 5] & (1 << (b & 0x1f)); ^ 7 errors generated. --- mrsas_linux.o --- *** [mrsas_linux.o] Error code 1 > Obtained from: AVAGO Technologies > MFC after: 2 weeks > > Modified: > head/sys/dev/mrsas/mrsas_linux.c > head/sys/modules/mrsas/Makefile > head/sys/modules/mrsas/mrsas_linux/Makefile > > Modified: head/sys/dev/mrsas/mrsas_linux.c > ============================================================================== > --- head/sys/dev/mrsas/mrsas_linux.c Wed Oct 8 09:19:35 2014 > (r272737) > +++ head/sys/dev/mrsas/mrsas_linux.c Wed Oct 8 09:30:35 2014 > (r272738) > @@ -39,10 +39,10 @@ > * Mail to: LSI Corporation, 1621 Barber Lane, Milpitas, CA 95035 > * ATTN: MegaRaid FreeBSD > * > + * $FreeBSD$ > */ > > #include <sys/cdefs.h> > -<!-- $FreeBSD$ --> > > #include <sys/param.h> > #include <sys/systm.h> > > Modified: head/sys/modules/mrsas/Makefile > ============================================================================== > --- head/sys/modules/mrsas/Makefile Wed Oct 8 09:19:35 2014 > (r272737) > +++ head/sys/modules/mrsas/Makefile Wed Oct 8 09:30:35 2014 > (r272738) > @@ -1,5 +1,5 @@ > # Makefile for mrsas driver > -<!-- $FreeBSD$ --> > +# $FreeBSD$ > > KMOD=mrsas > .PATH: ${.CURDIR}/../../dev/${KMOD} > > Modified: head/sys/modules/mrsas/mrsas_linux/Makefile > ============================================================================== > --- head/sys/modules/mrsas/mrsas_linux/Makefile Wed Oct 8 09:19:35 > 2014 (r272737) > +++ head/sys/modules/mrsas/mrsas_linux/Makefile Wed Oct 8 09:30:35 > 2014 (r272738) > @@ -1,5 +1,5 @@ > # Makefile for mrsas driver > -<!-- $FreeBSD$ --> > +# $FreeBSD$ > > .PATH: ${.CURDIR}/../../../dev/mrsas > > — Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983 _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
