Changeset cefb126 in mainline for kernel/arch/ppc32/include/mm/tlb.h


Ignore:
Timestamp:
2010-07-02T14:19:30Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
89c57b6
Parents:
fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rfe7abd0 rcefb126  
    7676
    7777extern void pht_init(void);
    78 extern void pht_refill(int, istate_t *);
     78extern void pht_refill(unsigned int, istate_t *);
    7979
    80 extern bool pht_refill_real(int, istate_t *)
     80extern bool pht_refill_real(unsigned int, istate_t *)
    8181    __attribute__ ((section("K_UNMAPPED_TEXT_START")));
    82 extern void tlb_refill_real(int, uint32_t, ptehi_t, ptelo_t, istate_t *)
    83     __attribute__ ((section("K_UNMAPPED_TEXT_START")));
     82extern void tlb_refill_real(unsigned int, uint32_t, ptehi_t, ptelo_t,
     83    istate_t *) __attribute__ ((section("K_UNMAPPED_TEXT_START")));
    8484
    8585#endif
Note: See TracChangeset for help on using the changeset viewer.