diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
commit | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (patch) | |
tree | db2ce73665b250672f5f5c0cf7544ec370c122f9 /arch/ppc64/kernel/pSeries_iommu.c | |
parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
parent | c594adad5653491813959277fb87a2fef54c4e05 (diff) | |
download | kernel-crypto-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.tar.gz kernel-crypto-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.tar.xz kernel-crypto-40193713df2cdb9c233b3fc2029ecdccb40cb1e4.zip |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/pSeries_iommu.c')
-rw-r--r-- | arch/ppc64/kernel/pSeries_iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c index 69130522a87..9d5e1e7fc38 100644 --- a/arch/ppc64/kernel/pSeries_iommu.c +++ b/arch/ppc64/kernel/pSeries_iommu.c @@ -45,6 +45,7 @@ #include <asm/plpar_wrappers.h> #include <asm/pSeries_reconfig.h> #include <asm/systemcfg.h> +#include <asm/firmware.h> #include "pci.h" #define DBG(fmt...) @@ -546,7 +547,7 @@ void iommu_init_early_pSeries(void) } if (systemcfg->platform & PLATFORM_LPAR) { - if (cur_cpu_spec->firmware_features & FW_FEATURE_MULTITCE) { + if (firmware_has_feature(FW_FEATURE_MULTITCE)) { ppc_md.tce_build = tce_buildmulti_pSeriesLP; ppc_md.tce_free = tce_freemulti_pSeriesLP; } else { |