diff options
author | Stephen Rothwell x <sfr@canb.auug.org.au> | 2009-05-06 14:07:52 +0000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-15 16:43:41 +1000 |
commit | 397717c578a5e02cf76b6c99c68f50fee94b59f8 (patch) | |
tree | c4b02725a662150a9ba7129bd6cbfaa98a4adcd0 /arch/powerpc/oprofile | |
parent | 93f1cc609c702a83e44da51cabdd353b20c24f79 (diff) | |
download | linux-397717c578a5e02cf76b6c99c68f50fee94b59f8.tar.bz2 |
powerpc/iseries: Fix pci breakage due to bad dma_data initialization
Commit 4fc665b88a79a45bae8bbf3a05563c27c7337c3d "powerpc: Merge 32 and
64-bit dma code" made changes to the PCI initialisation code that added
an assignment to archdata.dma_data but only for 32 bit code. Commit
7eef440a545c7f812ed10b49d4a10a351df9cad6 "powerpc/pci: Cosmetic cleanups
of pci-common.c" removed the conditional compilation. Unfortunately,
the iSeries code setup the archdata.dma_data before that assignment was
done - effectively overwriting the dma_data with NULL.
Fix this up by moving the iSeries setup of dma_data into a
pci_dma_dev_setup callback.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/oprofile')
0 files changed, 0 insertions, 0 deletions