Attachment 203844 Details for Bug 233863 – Investigatory patch for sys/powerpc/aim/mmu_oea64.c

[patch] Investigatory patch for sys/powerpc/aim/mmu_oea64.c

file_233863.txt (text/plain), 1.25 KB, created by Mark Millard on 2019-04-20 23:24:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Millard

Created: 2019-04-20 23:24:02 UTC

Size: 1.25 KB

patch

obsolete

>Index: /usr/src/sys/powerpc/aim/mmu_oea64.c
>===================================================================
>--- /usr/src/sys/powerpc/aim/mmu_oea64.c        (revision 341836)
>+++ /usr/src/sys/powerpc/aim/mmu_oea64.c        (working copy)
>@@ -502,7 +502,7 @@
>       register_t      msr;
>       vm_offset_t     off;
>       vm_paddr_t      pa_base;
>-       int             i, j;
>+       int             i, istep, j;
>
>       bzero(translations, sz);
>       OF_getencprop(OF_finddevice("/"), "#address-cells", &acells,
>@@ -512,7 +512,8 @@
>
>       CTR0(KTR_PMAP, "moea64_add_ofw_mappings: translations");
>       sz /= sizeof(cell_t);
>-       for (i = 0, j = 0; i < sz; j++) {
>+       istep = (acells == 2) ? 5 : 4;
>+       for (i = 0, j = 0; i+istep-1 < sz; j++) {
>               translations[j].om_va = trans_cells[i++];
>               translations[j].om_len = trans_cells[i++];
>               translations[j].om_pa = trans_cells[i++];
>@@ -522,7 +523,7 @@
>               }
>               translations[j].om_mode = trans_cells[i++];
>       }
>-       KASSERT(i == sz, ("Translations map has incorrect cell count (%d/%zd)",
>+       KASSERT(i+sz%istep == sz, ("Translations map has incorrect cell count (%d/%zd)",
>           i, sz));
>
>       sz = j;

Actions: View | Diff

Attachments on bug 233863: 199947 | 203622 | 203627 | 203652 | 203683 | 203812 | 203814 | 203844 | 203845 | 203889 | 203980 | 203981 | 203983 | 204307 | 204368 | 204369 | 223108