projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Wire up /proc/vmallocinfo to our ioremap()
[deliverable/linux.git]
/
arch
/
powerpc
/
platforms
/
cell
/
io-workarounds.c
diff --git
a/arch/powerpc/platforms/cell/io-workarounds.c
b/arch/powerpc/platforms/cell/io-workarounds.c
index b5f84e8f089990756daa13ca1101a9ccc4db74d6..5c1118e31940bf39d3a88926a16fc883c4f30d5f 100644
(file)
--- a/
arch/powerpc/platforms/cell/io-workarounds.c
+++ b/
arch/powerpc/platforms/cell/io-workarounds.c
@@
-130,14
+130,14
@@
static const struct ppc_pci_io __devinitconst iowa_pci_io = {
};
};
-static void __iomem *iowa_ioremap(
unsigned long
addr, unsigned long size,
-
unsigned long flags
)
+static void __iomem *iowa_ioremap(
phys_addr_t
addr, unsigned long size,
+
unsigned long flags, void *caller
)
{
struct iowa_bus *bus;
{
struct iowa_bus *bus;
- void __iomem *res = __ioremap
(addr, size, flags
);
+ void __iomem *res = __ioremap
_caller(addr, size, flags, caller
);
int busno;
int busno;
- bus = iowa_pci_find(0, addr);
+ bus = iowa_pci_find(0,
(unsigned long)
addr);
if (bus != NULL) {
busno = bus - iowa_busses;
PCI_SET_ADDR_TOKEN(res, busno + 1);
if (bus != NULL) {
busno = bus - iowa_busses;
PCI_SET_ADDR_TOKEN(res, busno + 1);
This page took
0.027343 seconds
and
5
git commands to generate.