projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] pgdat allocation for new node add (specify node id)
[powerpc.git]
/
drivers
/
parisc
/
dino.c
diff --git
a/drivers/parisc/dino.c
b/drivers/parisc/dino.c
index
216d1d8
..
6e8ed0c
100644
(file)
--- a/
drivers/parisc/dino.c
+++ b/
drivers/parisc/dino.c
@@
-5,6
+5,7
@@
** (c) Copyright 1999 SuSE GmbH
** (c) Copyright 1999,2000 Hewlett-Packard Company
** (c) Copyright 2000 Grant Grundler
** (c) Copyright 1999 SuSE GmbH
** (c) Copyright 1999,2000 Hewlett-Packard Company
** (c) Copyright 2000 Grant Grundler
+** (c) Copyright 2006 Helge Deller
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@
-785,7
+786,7
@@
dino_bridge_init(struct dino_device *dino_dev, const char *name)
if((io_addr & (1 << i)) == 0)
continue;
if((io_addr & (1 << i)) == 0)
continue;
- start =
(unsigned long)(signed int)(0xf0000000 | (i << 23)
);
+ start =
F_EXTEND(0xf0000000UL) | (i << 23
);
end = start + 8 * 1024 * 1024 - 1;
DBG("DINO RANGE %d is at 0x%lx-0x%lx\n", count,
end = start + 8 * 1024 * 1024 - 1;
DBG("DINO RANGE %d is at 0x%lx-0x%lx\n", count,
@@
-989,16
+990,14
@@
static int __init dino_probe(struct parisc_device *dev)
*/
}
*/
}
- dino_dev = k
m
alloc(sizeof(struct dino_device), GFP_KERNEL);
+ dino_dev = k
z
alloc(sizeof(struct dino_device), GFP_KERNEL);
if (!dino_dev) {
printk("dino_init_chip - couldn't alloc dino_device\n");
return 1;
}
if (!dino_dev) {
printk("dino_init_chip - couldn't alloc dino_device\n");
return 1;
}
- memset(dino_dev, 0, sizeof(struct dino_device));
-
dino_dev->hba.dev = dev;
dino_dev->hba.dev = dev;
- dino_dev->hba.base_addr = ioremap(hpa, 4096);
+ dino_dev->hba.base_addr = ioremap
_nocache
(hpa, 4096);
dino_dev->hba.lmmio_space_offset = 0; /* CPU addrs == bus addrs */
spin_lock_init(&dino_dev->dinosaur_pen);
dino_dev->hba.iommu = ccio_get_iommu(dev);
dino_dev->hba.lmmio_space_offset = 0; /* CPU addrs == bus addrs */
spin_lock_init(&dino_dev->dinosaur_pen);
dino_dev->hba.iommu = ccio_get_iommu(dev);