diff options
author | Steve French <sfrench@us.ibm.com> | 2008-08-26 16:56:05 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-08-26 16:56:05 +0000 |
commit | 3dae49abef945c55c10fa7c479cfd8fd13af55db (patch) | |
tree | 487c47c6d23cc28a259b913396aeaff0b792d32d /drivers/infiniband/hw/ipath/ipath_iba7220.c | |
parent | 6ce5eecb9cd3ac97b952c50309b87c31488a45e9 (diff) | |
parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
download | kernel_goldelico_gta04-3dae49abef945c55c10fa7c479cfd8fd13af55db.zip kernel_goldelico_gta04-3dae49abef945c55c10fa7c479cfd8fd13af55db.tar.gz kernel_goldelico_gta04-3dae49abef945c55c10fa7c479cfd8fd13af55db.tar.bz2 |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_iba7220.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c index d90f5e9..9839e20 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba7220.c +++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c @@ -1720,7 +1720,7 @@ static void ipath_7220_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr, "not 2KB aligned!\n", pa); return; } - if (pa >= (1UL << IBA7220_TID_SZ_SHIFT)) { + if (chippa >= (1UL << IBA7220_TID_SZ_SHIFT)) { ipath_dev_err(dd, "BUG: Physical page address 0x%lx " "larger than supported\n", pa); |