Date: Sun, 18 Jan 2015 13:22:02 +0000 From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Hans Petter Selasky <hps@selasky.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org 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... Message-ID: <73ED5E75-FB99-4413-985D-8BF3FF854318@FreeBSD.org> In-Reply-To: <54BB9114.9010200@selasky.org> References: <201501171636.t0HGadsf039591@svn.freebsd.org> <47909EEB-D9BF-43A1-B485-43680A86E170@FreeBSD.org> <AB8B216F-84E8-4628-A59F-50802EB25592@FreeBSD.org> <54BB81FC.3030501@selasky.org> <54BB9114.9010200@selasky.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 18 Jan 2015, at 10:55 , Hans Petter Selasky <hps@selasky.org> =
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."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?73ED5E75-FB99-4413-985D-8BF3FF854318>