diff options
| author |   Ralf Baechle <ralf@linux-mips.org> | 2006-06-17 18:57:39 +0100 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:52:35 -0400 |
| commit | d955d90b90db4b3ac2a3e56d271f372c41fb00d6 (patch) | |
| tree | ef769c3b50bebc185785a0cff1bb1d20b779656b | |
| parent | Merge branch 'master' into upstream (diff) | |
| download | linux-dev-d955d90b90db4b3ac2a3e56d271f372c41fb00d6.tar.xz linux-dev-d955d90b90db4b3ac2a3e56d271f372c41fb00d6.zip | |
[PATCH] IP27: Really set PCI64_ATTR_VIRTUAL, not PCI64_ATTR_PREC.
IOC3's homegrown DMA mapping functions that are used to optimize things
a little on IP27 set the wrong bit.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/ioc3-eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index ae71ed57c12d..e76e6e7be0b1 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c @@ -145,7 +145,7 @@ static inline struct sk_buff * ioc3_alloc_skb(unsigned long length, static inline unsigned long ioc3_map(void *ptr, unsigned long vdev) { #ifdef CONFIG_SGI_IP27 - vdev <<= 58; /* Shift to PCI64_ATTR_VIRTUAL */ + vdev <<= 57; /* Shift to PCI64_ATTR_VIRTUAL */ return vdev | (0xaUL << PCI64_ATTR_TARG_SHFT) | PCI64_ATTR_PREF | ((unsigned long)ptr & TO_PHYS_MASK); |