diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-14 06:51:42 +0200 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-14 06:51:42 +0200 |
| commit | 426c1a11a677e39a8c8ed744a521d0f4cb2e417e (patch) | |
| tree | efa10517ccd9469cfdf1b4390aeb776a8d3f1ddc /drivers/net/iseries_veth.c | |
| parent | powerpc: fix uname -m (diff) | |
| download | linux-426c1a11a677e39a8c8ed744a521d0f4cb2e417e.tar.xz linux-426c1a11a677e39a8c8ed744a521d0f4cb2e417e.zip | |
powerpc: move iSeries/iSeries_pci.h to platforms/iseries
The only real user of this file outside platforms/iseries was
drivers/net/iseries_veth.c but all it wanted was ISERIES_HV_ADDR()
so we move that to abs_addr.h (and lowercase it).
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers/net/iseries_veth.c')
| -rw-r--r-- | drivers/net/iseries_veth.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index 3d56cf5a4e23..db3bc2f6f0fa 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -70,8 +70,9 @@ #include <linux/delay.h> #include <linux/mm.h> #include <linux/ethtool.h> + +#include <asm/abs_addr.h> #include <asm/iSeries/mf.h> -#include <asm/iSeries/iSeries_pci.h> #include <asm/uaccess.h> #include <asm/iSeries/HvLpConfig.h> @@ -1397,13 +1398,13 @@ static inline void veth_build_dma_list(struct dma_chunk *list, * it just at the granularity of iSeries real->absolute * mapping? Indeed, given the way the allocator works, can we * count on them being absolutely contiguous? */ - list[0].addr = ISERIES_HV_ADDR(p); + list[0].addr = iseries_hv_addr(p); list[0].size = min(length, PAGE_SIZE - ((unsigned long)p & ~PAGE_MASK)); done = list[0].size; while (done < length) { - list[i].addr = ISERIES_HV_ADDR(p + done); + list[i].addr = iseries_hv_addr(p + done); list[i].size = min(length-done, PAGE_SIZE); done += list[i].size; i++; @@ -1496,8 +1497,8 @@ static void veth_receive(struct veth_lpar_connection *cnx, cnx->dst_inst, HvLpDma_AddressType_RealAddress, HvLpDma_AddressType_TceIndex, - ISERIES_HV_ADDR(&local_list), - ISERIES_HV_ADDR(&remote_list), + iseries_hv_addr(&local_list), + iseries_hv_addr(&remote_list), length); if (rc != HvLpDma_Rc_Good) { dev_kfree_skb_irq(skb); |