From owner-svn-src-all@FreeBSD.ORG Sun Jan 18 13:22:44 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC0CEE2; Sun, 18 Jan 2015 13:22:44 +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 517EED58; Sun, 18 Jan 2015 13:22:44 +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 23A9925D3A92; Sun, 18 Jan 2015 13:22:39 +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 9F59EC770AE; Sun, 18 Jan 2015 13:22:38 +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 MyryhhT2wYtr; Sun, 18 Jan 2015 13:22:36 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:8822:54a5:bf0c:ece7] (unknown [IPv6:fde9:577b:c1a9:4410:8822:54a5:bf0c:ece7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 1C62AC7706F; Sun, 18 Jan 2015 13:22:34 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) Subject: Re: svn commit: r277302 - in head/sys: conf modules modules/ibcore modules/ipoib modules/linuxapi modules/mlx4 modules/mlx4ib ofed/drivers/infiniband/core ofed/drivers/infiniband/hw/mlx4 ofed/drivers/i... From: "Bjoern A. Zeeb" In-Reply-To: <54BB9114.9010200@selasky.org> Date: Sun, 18 Jan 2015 13:22:02 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <73ED5E75-FB99-4413-985D-8BF3FF854318@FreeBSD.org> References: <201501171636.t0HGadsf039591@svn.freebsd.org> <47909EEB-D9BF-43A1-B485-43680A86E170@FreeBSD.org> <54BB81FC.3030501@selasky.org> <54BB9114.9010200@selasky.org> To: Hans Petter Selasky X-Mailer: Apple Mail (2.1993) 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: Sun, 18 Jan 2015 13:22:44 -0000 > On 18 Jan 2015, at 10:55 , Hans Petter Selasky = wrote: >=20 > See r277316. >=20 > Thank you! Thanks could you also check i386.XEN which seems to conflict on = redefined macros; here=E2=80=99s only a short excerpt: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:49: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kob= ject.h:34: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/ker= nel.h:40: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/bit= ops.h:38:9: error: 'BITS_TO_LONGS' macro redefined = [-Werror,-Wmacro-redefined] #define BITS_TO_LONGS(n) howmany((n), BITS_PER_LONG) ^ ./machine/xen/xenvar.h:99:9: note: previous definition is here #define BITS_TO_LONGS(bits) \ ^ In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:49: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kob= ject.h:34: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/ker= nel.h:40: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/bit= ops.h:297:9: error: 'test_bit' macro redefined = [-Werror,-Wmacro-redefined] #define test_bit(i, a) = \ ^ ./machine/xen/xen-os.h:224:9: note: previous definition is here #define test_bit(nr,addr) \ ^ In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:49: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kob= ject.h:34: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/ker= nel.h:40: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/bit= ops.h:302:1: error: conflicting types for 'test_and_clear_bit' test_and_clear_bit(long bit, long *var) ^ ./machine/xen/xen-os.h:197:21: note: previous definition is here static __inline int test_and_clear_bit(int nr, volatile void * addr) ^ In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:49: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kob= ject.h:34: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/ker= nel.h:43: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kth= read.h:39: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/sla= b.h:37: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/typ= es.h:63:9: error: 'DECLARE_BITMAP' macro redefined = [-Werror,-Wmacro-redefined] #define DECLARE_BITMAP(n, bits) = \ ^ =E2=80=A6 In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:49: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kob= ject.h:34: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/ker= nel.h:46: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/wai= t.h:32: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/spi= nlock.h:51:9: error: 'spin_lock_irqsave' macro redefined = [-Werror,-Wmacro-redefined] #define spin_lock_irqsave(lock, flags) = \ ^ ./machine/xen/xen-os.h:141:9: note: previous definition is here = = = =20 #define spin_lock_irqsave mtx_lock_irqsave ^ In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:49: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kob= ject.h:34: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/ker= nel.h:46: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/wai= t.h:32: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/spi= nlock.h:53:9: error: 'spin_unlock_irqrestore' macro redefined = [-Werror,-Wmacro-redefined] #define spin_unlock_irqrestore(lock, flags) = \ ^ ./machine/xen/xen-os.h:142:9: note: previous definition is here #define spin_unlock_irqrestore mtx_unlock_irqrestore ^ In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/lin= ux_compat.c:50: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/dev= ice.h:41: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/asm/atomi= c.h:39: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/linuxapi/../../ofed/include/linux/lin= ux_compat.c:50: In file included from = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/dev= ice.h:41: = /scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/asm/atomi= c.h:75:1: error: conflicting types for 'atomic_inc' atomic_inc(atomic_t *v) ^ ./machine/xen/xen-os.h:273:24: note: previous definition is here static __inline__ void atomic_inc(atomic_t *v) ^ =E2=80=94=20 Bjoern A. Zeeb Charles Haddon Spurgeon: "Friendship is one of the sweetest joys of life. Many might have failed beneath the bitterness of their trial had they not found a friend."