git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_doorbell.h
diff --git
a/drivers/infiniband/hw/mthca/mthca_doorbell.h
b/drivers/infiniband/hw/mthca/mthca_doorbell.h
index
821039a
..
dd9a44d
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_doorbell.h
+++ b/
drivers/infiniband/hw/mthca/mthca_doorbell.h
@@
-1,5
+1,7
@@
/*
* Copyright (c) 2004 Topspin Communications. All rights reserved.
/*
* Copyright (c) 2004 Topspin Communications. All rights reserved.
+ * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@
-56,13
+58,13
@@
static inline void mthca_write64_raw(__be64 val, void __iomem *dest)
__raw_writeq((__force u64) val, dest);
}
__raw_writeq((__force u64) val, dest);
}
-static inline void mthca_write64(
u
32 val[2], void __iomem *dest,
+static inline void mthca_write64(
__be
32 val[2], void __iomem *dest,
spinlock_t *doorbell_lock)
{
__raw_writeq(*(u64 *) val, dest);
}
spinlock_t *doorbell_lock)
{
__raw_writeq(*(u64 *) val, dest);
}
-static inline void mthca_write_db_rec(
u32 val[2], u
32 *db)
+static inline void mthca_write_db_rec(
__be32 val[2], __be
32 *db)
{
*(u64 *) db = *(u64 *) val;
}
{
*(u64 *) db = *(u64 *) val;
}
@@
-85,18
+87,18
@@
static inline void mthca_write64_raw(__be64 val, void __iomem *dest)
__raw_writel(((__force u32 *) &val)[1], dest + 4);
}
__raw_writel(((__force u32 *) &val)[1], dest + 4);
}
-static inline void mthca_write64(
u
32 val[2], void __iomem *dest,
+static inline void mthca_write64(
__be
32 val[2], void __iomem *dest,
spinlock_t *doorbell_lock)
{
unsigned long flags;
spin_lock_irqsave(doorbell_lock, flags);
spinlock_t *doorbell_lock)
{
unsigned long flags;
spin_lock_irqsave(doorbell_lock, flags);
- __raw_writel(val[0], dest);
- __raw_writel(val[1], dest + 4);
+ __raw_writel(
(__force u32)
val[0], dest);
+ __raw_writel(
(__force u32)
val[1], dest + 4);
spin_unlock_irqrestore(doorbell_lock, flags);
}
spin_unlock_irqrestore(doorbell_lock, flags);
}
-static inline void mthca_write_db_rec(
u32 val[2], u
32 *db)
+static inline void mthca_write_db_rec(
__be32 val[2], __be
32 *db)
{
db[0] = val[0];
wmb();
{
db[0] = val[0];
wmb();