XEN kernel broken with mlx5*

[NGie Cooper]

Hi HPS,
	It seems that XEN.i386 is broken with the mlx5* module due to a mismatch in function definitions. Some refactoring took place on head that appears to have “fixed” this issue. Could you or Roger please fix it?
Thanks,
-NGie

In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/linux_radix.c:36:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/slab.h:38:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/gfp.h:38:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/page.h:38:
In file included from @/vm/vm_page.h:70:
In file included from @/vm/pmap.h:90:
In file included from ./machine/pmap.h:227:
./machine/xen/xenvar.h:101:9: error: 'DECLARE_BITMAP' macro redefined [-Werror]
#define DECLARE_BITMAP(name,bits) \
        ^
/scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/types.h:63:9: note: previous definition is here
#define DECLARE_BITMAP(n, bits)                                         \
        ^
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/linux_radix.c:37:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/kernel.h:42:
/scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/bitops.h:38:9: error: 'BITS_TO_LONGS' macro redefined [-Werror]
#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/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/linux_radix.c:37:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/kernel.h:42:
/scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/bitops.h:307:9: error: 'test_bit' macro redefined [-Werror]
#define test_bit(i, a)                                                  \
        ^
./machine/xen/xen-os.h:225:9: note: previous definition is here
#define test_bit(nr,addr) \
        ^
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/linux_radix.c:37:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/kernel.h:42:
/scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/bitops.h:312:1: error: conflicting types for 'test_and_clear_bit'
test_and_clear_bit(long bit, long *var)
^
./machine/xen/xen-os.h:198:21: note: previous definition is here
static __inline int test_and_clear_bit(int nr, volatile void * addr)
                    ^
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/linux_radix.c:37:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/kernel.h:48:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/wait.h:32:
/scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/spinlock.h:51:9: error: 'spin_lock_irqsave' macro redefined [-Werror]
#define spin_lock_irqsave(lock, flags)                                  \
        ^
./machine/xen/xen-os.h:142:9: note: previous definition is here
#define spin_lock_irqsave mtx_lock_irqsave
        ^
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/linux_radix.c:37:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/kernel.h:48:
In file included from /scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/wait.h:32:
/scratch/tmp/ngie/svn/sys/modules/mlx5/../../ofed/include/linux/spinlock.h:53:9: error: 'spin_unlock_irqrestore' macro redefined [-Werror]
#define spin_unlock_irqrestore(lock, flags)                             \
        ^
./machine/xen/xen-os.h:143:9: note: previous definition is here
#define spin_unlock_irqrestore mtx_unlock_irqrestore
        ^
6 errors generated.