> On 18 Jan 2015, at 10:55 , Hans Petter Selasky <h...@selasky.org> wrote:
>
> See r277316.
>
> Thank you!
Thanks could you also check i386.XEN which seems to conflict on redefined
macros; here’s only a short excerpt:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/linux_compat.c:49:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kobject.h:34:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kernel.h:40:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/bitops.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/linux_compat.c:49:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kobject.h:34:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kernel.h:40:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/bitops.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/linux_compat.c:49:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kobject.h:34:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kernel.h:40:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/bitops.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/linux_compat.c:49:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kobject.h:34:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kernel.h:43:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kthread.h:39:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/slab.h:37:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/types.h:63:9:
error: 'DECLARE_BITMAP' macro redefined [-Werror,-Wmacro-redefined]
#define DECLARE_BITMAP(n, bits) \
^
…
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/linux_compat.c:49:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kobject.h:34:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kernel.h:46:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/wait.h:32:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/spinlock.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
#define spin_lock_irqsave mtx_lock_irqsave
^
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/linux_compat.c:49:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kobject.h:34:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/kernel.h:46:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/wait.h:32:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/spinlock.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/linux_compat.c:50:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/device.h:41:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/asm/atomic.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/linux_compat.c:50:
In file included from
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/linux/device.h:41:
/scratch/tmp/bz/head.svn/sys/modules/linuxapi/../../ofed/include/asm/atomic.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)
^
—
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."
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
