Changeset c2a6983 in mainline for uspace/srv/bd/rd/rd.c


Ignore:
Timestamp:
2013-10-13T20:59:33Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
12d6c98
Parents:
820104d (diff), 39bcc99 (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

  • uspace/srv/bd/rd/rd.c

    r820104d rc2a6983  
    165165            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
    166166       
    167         ret = physmem_map((void *) addr_phys,
     167        ret = physmem_map(addr_phys,
    168168            ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags, &rd_addr);
    169169        if (ret != EOK) {
Note: See TracChangeset for help on using the changeset viewer.