Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 370893
b: refs/heads/master
c: 3dc4fec
h: refs/heads/master
i:
  370891: 92bd428
v: v3
  • Loading branch information
Aneesh Kumar K.V authored and Benjamin Herrenschmidt committed Apr 30, 2013
1 parent 2f23087 commit c6c4fd3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: d8139ebf8596a1e56bd98b7a83e8777b5ff5fb2d
refs/heads/master: 3dc4feca4bf39d12f35a0e8c6997a8e188ab6cb8
10 changes: 5 additions & 5 deletions trunk/arch/powerpc/mm/hash_utils_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
prop = (u32 *)of_get_flat_dt_prop(node,
"ibm,segment-page-sizes", &size);
if (prop != NULL) {
DBG("Page sizes from device-tree:\n");
pr_info("Page sizes from device-tree:\n");
size /= 4;
cur_cpu_spec->mmu_features &= ~(MMU_FTR_16M_PAGE);
while(size > 0) {
Expand Down Expand Up @@ -370,10 +370,10 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
"shift=%d\n", base_shift, shift);

def->penc[idx] = penc;
DBG(" %d: shift=%02x, sllp=%04lx, "
"avpnm=%08lx, tlbiel=%d, penc=%d\n",
idx, shift, def->sllp, def->avpnm,
def->tlbiel, def->penc[idx]);
pr_info("base_shift=%d: shift=%d, sllp=0x%04lx,"
" avpnm=0x%08lx, tlbiel=%d, penc=%d\n",
base_shift, shift, def->sllp,
def->avpnm, def->tlbiel, def->penc[idx]);
}
}
return 1;
Expand Down

0 comments on commit c6c4fd3

Please sign in to comment.