diff options
| author | marcel <marcel@FreeBSD.org> | 2004-11-21 21:40:08 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2004-11-21 21:40:08 +0000 |
| commit | 480c409ecf45e53c6ba38e1d86ceb4fe3238a70a (patch) | |
| tree | a6e8598a29ae1bee0634661b5299f68b2753f0e5 /sys/boot/efi | |
| parent | f90c20620f68324184b69ab66a00c4393f638a26 (diff) | |
| download | FreeBSD-src-480c409ecf45e53c6ba38e1d86ceb4fe3238a70a.zip FreeBSD-src-480c409ecf45e53c6ba38e1d86ceb4fe3238a70a.tar.gz | |
Remove struct ia64_itir and use a plain old uint64_t instead.
Diffstat (limited to 'sys/boot/efi')
| -rw-r--r-- | sys/boot/efi/loader/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c index 6491683..69b6387 100644 --- a/sys/boot/efi/loader/main.c +++ b/sys/boot/efi/loader/main.c @@ -388,7 +388,7 @@ print_trs(int type) int i, maxtr; struct { pt_entry_t pte; - struct ia64_itir itir; + uint64_t itir; uint64_t ifa; struct ia64_rr rr; } buf; @@ -445,7 +445,8 @@ print_trs(int type) buf.pte &= ~PTE_MA_MASK; sprintf(lbuf, "%03d %06x %013lx %013lx %4s %d %d %d %d %d " "%-3s %d %06x\n", i, buf.rr.rr_rid, buf.ifa >> 12, - (buf.pte & PTE_PPN_MASK) >> 12, psnames[buf.itir.ps], + (buf.pte & PTE_PPN_MASK) >> 12, + psnames[(buf.itir & ITIR_PS_MASK) >> 2], (buf.pte & PTE_ED) ? 1 : 0, (int)(buf.pte & PTE_AR_MASK) >> 9, (int)(buf.pte & PTE_PL_MASK) >> 7, @@ -453,7 +454,7 @@ print_trs(int type) (buf.pte & PTE_ACCESSED) ? 1 : 0, manames[(buf.pte & PTE_MA_MASK) >> 2], (buf.pte & PTE_PRESENT) ? 1 : 0, - buf.itir.key); + (int)((buf.itir & ITIR_KEY_MASK) >> 8)); pager_output(lbuf); } pager_close(); |
