Patchwork infiniband/ehca: spin_lock_irqsave takes an unsigned long

login
register
mail settings
Submitter Stephen Rothwell
Date Dec. 31, 2008, 3:12 a.m.
Message ID <20081231141257.9bafac41.sfr@canb.auug.org.au>
Download mbox | patch
Permalink /patch/16108/
State Accepted, archived
Commit 7ddccb234ce1039f89387e0cec9c29dccf6e3476
Headers show

Comments

Stephen Rothwell - Dec. 31, 2008, 3:12 a.m.
This will also help prevent some warnings when we change u64 to unsigned
long long.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/hw/ehca/ehca_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Roland Dreier - Dec. 31, 2008, 4:20 a.m.
are you trying to land the 'typedef unsigned long u64' change for
2.6.28, or can these patches wait for 2.6.29?

 - R.
Stephen Rothwell - Dec. 31, 2008, 4:44 a.m.
Hi Roland,

On Tue, 30 Dec 2008 20:20:29 -0800 Roland Dreier <rdreier@cisco.com> wrote:
>
> are you trying to land the 'typedef unsigned long u64' change for
> 2.6.28, or can these patches wait for 2.6.29?

2.6.29 (or even 30), I would think at this point.
Roland Dreier - Jan. 7, 2009, 7:24 p.m.
thanks, applied.

Patch

diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 3b77b67..c7b8a50 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -955,7 +955,7 @@  void ehca_poll_eqs(unsigned long data)
 			struct ehca_eq *eq = &shca->eq;
 			int max = 3;
 			volatile u64 q_ofs, q_ofs2;
-			u64 flags;
+			unsigned long flags;
 			spin_lock_irqsave(&eq->spinlock, flags);
 			q_ofs = eq->ipz_queue.current_q_offset;
 			spin_unlock_irqrestore(&eq->spinlock, flags);