Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for kernel/genarch/src/mm/page_ht.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/genarch/src/mm/page_ht.c

    r37f7cfe ra9b6bec  
    5252#include <align.h>
    5353
    54 static size_t hash(unative_t[]);
    55 static bool compare(unative_t[], size_t, link_t *);
     54static size_t hash(sysarg_t[]);
     55static bool compare(sysarg_t[], size_t, link_t *);
    5656static void remove_callback(link_t *);
    5757
     
    9696 *
    9797 */
    98 size_t hash(unative_t key[])
     98size_t hash(sysarg_t key[])
    9999{
    100100        as_t *as = (as_t *) key[KEY_AS];
     
    115115         *
    116116         */
    117         index |= ((unative_t) as) & (PAGE_HT_ENTRIES - 1);
     117        index |= ((sysarg_t) as) & (PAGE_HT_ENTRIES - 1);
    118118       
    119119        return index;
     
    129129 *
    130130 */
    131 bool compare(unative_t key[], size_t keys, link_t *item)
     131bool compare(sysarg_t key[], size_t keys, link_t *item)
    132132{
    133133        ASSERT(item);
     
    180180    unsigned int flags)
    181181{
    182         unative_t key[2] = {
     182        sysarg_t key[2] = {
    183183                (uintptr_t) as,
    184184                page = ALIGN_DOWN(page, PAGE_SIZE)
     
    220220void ht_mapping_remove(as_t *as, uintptr_t page)
    221221{
    222         unative_t key[2] = {
     222        sysarg_t key[2] = {
    223223                (uintptr_t) as,
    224224                page = ALIGN_DOWN(page, PAGE_SIZE)
     
    247247pte_t *ht_mapping_find(as_t *as, uintptr_t page)
    248248{
    249         unative_t key[2] = {
     249        sysarg_t key[2] = {
    250250                (uintptr_t) as,
    251251                page = ALIGN_DOWN(page, PAGE_SIZE)
Note: See TracChangeset for help on using the changeset viewer.