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

Changeset e10d41a in mainline


Ignore:
Timestamp:
2012-02-10T09:54:10Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
03934c9e, 591762c6, cfb79747, edd7c63c
Parents:
bb6f135 (diff), 96d9cdd (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/mm.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/mm/km.c

    rbb6f135 re10d41a  
    151151{
    152152        uintptr_t offs;
    153         size_t align;
    154153        ipl_t ipl;
    155154
     
    170169        page_table_unlock(AS_KERNEL, true);
    171170
    172         /*
    173          * Match the size parameter with that of km_page_alloc() in
    174          * km_map_aligned().
    175          */
    176         align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
    177         km_page_free(vaddr, max(PAGE_SIZE, align));
     171        km_page_free(vaddr, size);
    178172}
    179173
Note: See TracChangeset for help on using the changeset viewer.