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

Changeset ec8c622 in mainline


Ignore:
Timestamp:
2012-02-18T23:47:39Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
087768f, 475dc3e
Parents:
f943dd3 (diff), 0428f77 (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 from lp:~jakub/helenos/ia64-revival.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    rf943dd3 rec8c622  
    144144#endif
    145145#ifdef MACHINE_i460GX
    146         platform = "i460GX";
     146        platform = "pc";
    147147#endif
    148148        sysinfo_set_item_data("platform", NULL, (void *) platform,
  • kernel/generic/src/mm/page.c

    rf943dd3 rec8c622  
    168168int page_find_mapping(uintptr_t virt, void **phys)
    169169{
    170         mutex_lock(&AS->lock);
     170        page_table_lock(AS, true);
    171171       
    172172        pte_t *pte = page_mapping_find(AS, virt, false);
    173173        if ((!PTE_VALID(pte)) || (!PTE_PRESENT(pte))) {
    174                 mutex_unlock(&AS->lock);
     174                page_table_unlock(AS, true);
    175175                return ENOENT;
    176176        }
     
    179179            (virt - ALIGN_DOWN(virt, PAGE_SIZE));
    180180       
    181         mutex_unlock(&AS->lock);
     181        page_table_unlock(AS, true);
    182182       
    183183        return EOK;
  • uspace/lib/c/arch/ia64/include/ddi.h

    rf943dd3 rec8c622  
    134134        asm volatile ("mf\n" ::: "memory");
    135135
    136         if (port < (ioport32_t *) port) {
     136        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
    137137                uintptr_t prt = (uintptr_t) port;
    138138
Note: See TracChangeset for help on using the changeset viewer.