diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 08:01:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 08:01:48 -0800 |
commit | f885b51967fb5f611c462841e5119853df00cc97 (patch) | |
tree | 29ba7f6eb9dd607980e63917e7f68e88578e7aca /arch/powerpc/platforms/pseries/lpar.c | |
parent | 5d5d80001df3fbd06bd2b8893b6e3847e38a12d6 (diff) | |
parent | dfbe0d3b6be52596b5694b1bb75b19562e769021 (diff) | |
download | op-kernel-dev-f885b51967fb5f611c462841e5119853df00cc97.zip op-kernel-dev-f885b51967fb5f611c462841e5119853df00cc97.tar.gz |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix boot failure on POWER6
[POWERPC] Workaround for iommu page alignment
Diffstat (limited to 'arch/powerpc/platforms/pseries/lpar.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 34317aa..9a455d4 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -272,7 +272,6 @@ void vpa_init(int cpu) */ addr = __pa(&slb_shadow[cpu]); if (firmware_has_feature(FW_FEATURE_SPLPAR)) { - slb_shadow_clear_all(); ret = register_slb_shadow(hwcpu, addr); if (ret) printk(KERN_ERR |