Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc64 / kernel / iSeries_htab.c

diff --git a/arch/ppc64/kernel/iSeries_htab.c b/arch/ppc64/kernel/iSeries_htab.c
index 2456227..aa9e8fd 100644 (file)
--- a/arch/ppc64/kernel/iSeries_htab.c
+++ b/arch/ppc64/kernel/iSeries_htab.c
@@ -144,6 +144,10 @@ static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
 
        HvCallHpt_get(&hpte, slot);
        if ((hpte.dw0.dw0.avpn == avpn) && (hpte.dw0.dw0.v)) {
+               /*
+                * Hypervisor expects bits as NPPP, which is
+                * different from how they are mapped in our PP.
+                */
                HvCallHpt_setPp(slot, (newpp & 0x3) | ((newpp & 0x4) << 1));
                iSeries_hunlock(slot);
                return 0;
@@ -233,4 +237,6 @@ void hpte_init_iSeries(void)
        ppc_md.hpte_updateboltedpp = iSeries_hpte_updateboltedpp;
        ppc_md.hpte_insert      = iSeries_hpte_insert;
        ppc_md.hpte_remove      = iSeries_hpte_remove;
+
+       htab_finish_init();
 }