From owner-svn-src-all@FreeBSD.ORG Wed Oct 8 15:57:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AA468B5; Wed, 8 Oct 2014 15:57:36 +0000 (UTC) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id BB52A286; Wed, 8 Oct 2014 15:57:35 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 9E1AE25D388C; Wed, 8 Oct 2014 15:57:31 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id B9F56C7700E; Wed, 8 Oct 2014 15:57:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id BdPkt32o8XSW; Wed, 8 Oct 2014 15:57:27 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6] (orange-tun0-ula.sbone.de [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id B5C34C76FD3; Wed, 8 Oct 2014 15:57:26 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r272738 - in head/sys: dev/mrsas modules/mrsas modules/mrsas/mrsas_linux From: "Bjoern A. Zeeb" In-Reply-To: <201410080930.s989Uat9073960@svn.freebsd.org> Date: Wed, 8 Oct 2014 15:57:25 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <3F8BC7C7-412E-47E8-8837-CB95738C3512@lists.zabbadoz.net> References: <201410080930.s989Uat9073960@svn.freebsd.org> To: Kashyap D Desai X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Oct 2014 15:57:36 -0000 On 08 Oct 2014, at 09:30 , Kashyap D Desai wrote: > Author: kadesai > Date: Wed Oct 8 09:30:35 2014 > New Revision: 272738 > URL: https://svnweb.freebsd.org/changeset/base/272738 >=20 > Log: > Fix the minor svn add issue. $FreeBSD$ expands at the time of > snv add, so I have added $FreeBSD$ as comment. >=20 > This commit is contininous of last mrsas commit, so that compilation > does not break. >=20 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 >=20 > Modified: > head/sys/dev/mrsas/mrsas_linux.c > head/sys/modules/mrsas/Makefile > head/sys/modules/mrsas/mrsas_linux/Makefile >=20 > Modified: head/sys/dev/mrsas/mrsas_linux.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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$ > */ >=20 > #include > - >=20 > #include > #include >=20 > Modified: head/sys/modules/mrsas/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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$ >=20 > KMOD=3Dmrsas > .PATH: ${.CURDIR}/../../dev/${KMOD} >=20 > Modified: head/sys/modules/mrsas/mrsas_linux/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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$ >=20 > .PATH: ${.CURDIR}/../../../dev/mrsas >=20 >=20 =97=20 Bjoern A. Zeeb "Come on. Learn, goddamn it.", WarGames, 1983