Changeset 98000fb in mainline for kernel/arch/ia64


Ignore:
Timestamp:
2009-06-03T19:34:45Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
301ff30
Parents:
69e68e3
Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:
kernel/arch/ia64
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/include/mm/page.h

    r69e68e3 r98000fb  
    241241 * @return Current contents of rr[i].
    242242 */
    243 static inline uint64_t rr_read(index_t i)
     243static inline uint64_t rr_read(size_t i)
    244244{
    245245        uint64_t ret;
    … …  
    254254 * @param v Value to be written to rr[i].
    255255 */
    256 static inline void rr_write(index_t i, uint64_t v)
     256static inline void rr_write(size_t i, uint64_t v)
    257257{
    258258        ASSERT(i < REGION_REGISTERS);

  • kernel/arch/ia64/include/mm/tlb.h

    r69e68e3 r98000fb  
    7777extern void itc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry);
    7878
    79 extern void tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr, index_t tr);
    80 extern void dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr);
    81 extern void itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr);
     79extern void tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr, size_t tr);
     80extern void dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr);
     81extern void itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr);
    8282
    83 extern void dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr, index_t tr);
    84 extern void dtr_purge(uintptr_t page, count_t width);
     83extern void dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr, size_t tr);
     84extern void dtr_purge(uintptr_t page, size_t width);
    8585
    8686extern void dtc_pte_copy(pte_t *t);

  • kernel/arch/ia64/include/types.h

    r69e68e3 r98000fb  
    5555
    5656typedef uint64_t size_t;
    57 typedef uint64_t count_t;
    58 typedef uint64_t index_t;
    5957
    6058typedef uint64_t uintptr_t;
    … …  
    7371#define PRIp "lx"       /**< Format for uintptr_t. */
    7472#define PRIs "lu"       /**< Format for size_t. */
    75 #define PRIc "lu"       /**< Format for count_t. */
    76 #define PRIi "lu"       /**< Format for index_t. */
    7773
    7874#define PRId8 "d"       /**< Format for int8_t. */

  • kernel/arch/ia64/src/mm/page.c

    r69e68e3 r98000fb  
    132132{
    133133        region_register rr_save, rr;
    134         index_t vrn;
     134        size_t vrn;
    135135        rid_t rid;
    136136        vhpt_entry_t *v;
    … …  
    177177{
    178178        region_register rr_save, rr;   
    179         index_t vrn;
     179        size_t vrn;
    180180        rid_t rid;
    181181        bool match;
    … …  
    224224{
    225225        region_register rr_save, rr;   
    226         index_t vrn;
     226        size_t vrn;
    227227        rid_t rid;
    228228        uint64_t tag;

  • kernel/arch/ia64/src/mm/tlb.c

    r69e68e3 r98000fb  
    101101
    102102
    103 void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
     103void tlb_invalidate_pages(asid_t asid, uintptr_t page, size_t cnt)
    104104{
    105105        region_register rr;
    … …  
    268268 */
    269269void
    270 itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr)
     270itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr)
    271271{
    272272        tr_mapping_insert(va, asid, entry, false, tr);
    … …  
    282282 */
    283283void
    284 dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr)
     284dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr)
    285285{
    286286        tr_mapping_insert(va, asid, entry, true, tr);
    … …  
    299299void
    300300tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr,
    301     index_t tr)
     301    size_t tr)
    302302{
    303303        region_register rr;
    … …  
    354354void
    355355dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr,
    356     index_t tr)
     356    size_t tr)
    357357{
    358358        tlb_entry_t entry;
    … …  
    383383 * @param width         Width of the purge in bits.
    384384 */
    385 void dtr_purge(uintptr_t page, count_t width)
     385void dtr_purge(uintptr_t page, size_t width)
    386386{
    387387        asm volatile ("ptr.d %0, %1\n" : : "r" (page), "r" (width << 2));

  • kernel/arch/ia64/src/mm/vhpt.c

    r69e68e3 r98000fb  
    5454{
    5555        region_register rr_save, rr;
    56         index_t vrn;
     56        size_t vrn;
    5757        rid_t rid;
    5858        uint64_t tag;
Note: See TracChangeset for help on using the changeset viewer.