diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2004-08-10 02:08:57 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2004-08-10 02:08:57 +0000 |
| commit | 0797d69c788530f4ddbf9d96a03e08dad0cd1661 (patch) | |
| tree | 7cc0041c95aed3e1372d6f8785ade7a6967c007a /sys | |
| parent | f8da56fda8d4eb4543e51d02cf50aa8ce26d8e6a (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/efi/loader/main.c | 17 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/main.c | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c index 752c243abfd17..30b4f257e04c7 100644 --- a/sys/boot/efi/loader/main.c +++ b/sys/boot/efi/loader/main.c @@ -384,15 +384,15 @@ command_sal(int argc, char *argv[]) int print_trs(int type) { - struct ia64_pal_result res; - int i, maxtr; + struct ia64_pal_result res; + int i, maxtr; struct { struct ia64_pte pte; struct ia64_itir itir; - struct ia64_ifa ifa; + uint64_t ifa; struct ia64_rr rr; - } buf; - static const char* psnames[] = { + } buf; + static const char *psnames[] = { "1B", "2B", "4B", "8B", "16B", "32B", "64B", "128B", "256B", "512B", "1K", "2K", @@ -402,10 +402,9 @@ print_trs(int type) "16M", "32M", "64M", "128M", "256M", "512M", "1G", "2G" }; - static const char* manames[] = { + static const char *manames[] = { "WB", "bad", "bad", "bad", "UC", "UCE", "WC", "NaT", - }; res = ia64_call_pal_static(PAL_VM_SUMMARY, 0, 0, 0); @@ -433,7 +432,7 @@ print_trs(int type) break; /* Only display valid translations */ - if ((buf.ifa.ifa_ig & 1) == 0) + if ((buf.ifa & 1) == 0) continue; if (!(res.pal_result[0] & 1)) @@ -448,7 +447,7 @@ print_trs(int type) "%03d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", i, buf.rr.rr_rid, - buf.ifa.ifa_vpn, + buf.ifa >> 12, buf.pte.pte_ppn, psnames[buf.itir.itir_ps], buf.pte.pte_ed, diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c index 752c243abfd17..30b4f257e04c7 100644 --- a/sys/boot/ia64/efi/main.c +++ b/sys/boot/ia64/efi/main.c @@ -384,15 +384,15 @@ command_sal(int argc, char *argv[]) int print_trs(int type) { - struct ia64_pal_result res; - int i, maxtr; + struct ia64_pal_result res; + int i, maxtr; struct { struct ia64_pte pte; struct ia64_itir itir; - struct ia64_ifa ifa; + uint64_t ifa; struct ia64_rr rr; - } buf; - static const char* psnames[] = { + } buf; + static const char *psnames[] = { "1B", "2B", "4B", "8B", "16B", "32B", "64B", "128B", "256B", "512B", "1K", "2K", @@ -402,10 +402,9 @@ print_trs(int type) "16M", "32M", "64M", "128M", "256M", "512M", "1G", "2G" }; - static const char* manames[] = { + static const char *manames[] = { "WB", "bad", "bad", "bad", "UC", "UCE", "WC", "NaT", - }; res = ia64_call_pal_static(PAL_VM_SUMMARY, 0, 0, 0); @@ -433,7 +432,7 @@ print_trs(int type) break; /* Only display valid translations */ - if ((buf.ifa.ifa_ig & 1) == 0) + if ((buf.ifa & 1) == 0) continue; if (!(res.pal_result[0] & 1)) @@ -448,7 +447,7 @@ print_trs(int type) "%03d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", i, buf.rr.rr_rid, - buf.ifa.ifa_vpn, + buf.ifa >> 12, buf.pte.pte_ppn, psnames[buf.itir.itir_ps], buf.pte.pte_ed, |