Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 155071
b: refs/heads/master
c: 551a232
h: refs/heads/master
i:
  155069: add456e
  155067: 3b608a7
  155063: 64d7d1e
  155055: c8e2af4
  155039: 1d47715
  155007: a08d3f9
v: v3
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Jul 8, 2009
1 parent b989260 commit 7bc1a02
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 01cc82623aea0b96ee2cba4534d1954ad793cfc3
refs/heads/master: 551a232c87b7781712c57c31f3e0851303d9f591
18 changes: 9 additions & 9 deletions trunk/arch/powerpc/platforms/pseries/lpar.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,15 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
unsigned long hpte_v, hpte_r;

if (!(vflags & HPTE_V_BOLTED))
pr_debug("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
pr_devel("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
"rflags=%lx, vflags=%lx, psize=%d)\n",
hpte_group, va, pa, rflags, vflags, psize);

hpte_v = hpte_encode_v(va, psize, ssize) | vflags | HPTE_V_VALID;
hpte_r = hpte_encode_r(pa, psize) | rflags;

if (!(vflags & HPTE_V_BOLTED))
pr_debug(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
pr_devel(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);

/* Now fill in the actual HPTE */
/* Set CEC cookie to 0 */
Expand All @@ -311,7 +311,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);
if (unlikely(lpar_rc == H_PTEG_FULL)) {
if (!(vflags & HPTE_V_BOLTED))
pr_debug(" full\n");
pr_devel(" full\n");
return -1;
}

Expand All @@ -322,11 +322,11 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
*/
if (unlikely(lpar_rc != H_SUCCESS)) {
if (!(vflags & HPTE_V_BOLTED))
pr_debug(" lpar err %lu\n", lpar_rc);
pr_devel(" lpar err %lu\n", lpar_rc);
return -2;
}
if (!(vflags & HPTE_V_BOLTED))
pr_debug(" -> slot: %lu\n", slot & 7);
pr_devel(" -> slot: %lu\n", slot & 7);

/* Because of iSeries, we have to pass down the secondary
* bucket bit here as well
Expand Down Expand Up @@ -418,17 +418,17 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot,

want_v = hpte_encode_avpn(va, psize, ssize);

pr_debug(" update: avpnv=%016lx, hash=%016lx, f=%lx, psize: %d ...",
pr_devel(" update: avpnv=%016lx, hash=%016lx, f=%lx, psize: %d ...",
want_v, slot, flags, psize);

lpar_rc = plpar_pte_protect(flags, slot, want_v);

if (lpar_rc == H_NOT_FOUND) {
pr_debug("not found !\n");
pr_devel("not found !\n");
return -1;
}

pr_debug("ok\n");
pr_devel("ok\n");

BUG_ON(lpar_rc != H_SUCCESS);

Expand Down Expand Up @@ -503,7 +503,7 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
unsigned long lpar_rc;
unsigned long dummy1, dummy2;

pr_debug(" inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
pr_devel(" inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
slot, va, psize, local);

want_v = hpte_encode_avpn(va, psize, ssize);
Expand Down

0 comments on commit 7bc1a02

Please sign in to comment.