git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
aacraid
/
comminit.c
diff --git
a/drivers/scsi/aacraid/comminit.c
b/drivers/scsi/aacraid/comminit.c
index 3009ad8c407343d209e9b4d0a79639f0dbbfd4fe..8736813a029657b494d143b93f7b83f484523693 100644
(file)
--- a/
drivers/scsi/aacraid/comminit.c
+++ b/
drivers/scsi/aacraid/comminit.c
@@
-110,7
+110,7
@@
static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
/*
* Align the beginning of Headers to commalign
*/
- align = (commalign - ((
ptrdiff
_t)(base) & (commalign - 1)));
+ align = (commalign - ((
uintptr
_t)(base) & (commalign - 1)));
base = base + align;
phys = phys + align;
/*