1.1 --- a/libexec/lib/src/internal_pager.cc	Fri Sep 16 15:17:22 2022 +0200
     1.2 +++ b/libexec/lib/src/internal_pager.cc	Fri Sep 16 15:24:38 2022 +0200
     1.3 @@ -110,9 +110,9 @@
     1.4  
     1.5    if ((addr >= r.start) && (addr < r.start + r.size))
     1.6    {
     1.7 -    offset_t window_size = L4_PAGESIZE;
     1.8 +    address_t window_size = L4_PAGESIZE;
     1.9      address_t window_base = trunc(addr, window_size);
    1.10 -    offset_t offset = addr - r.start;
    1.11 +    address_t offset = addr - r.start;
    1.12      address_t page_addr = trunc(addr, L4_PAGESIZE);
    1.13      address_t hot_spot = page_addr - window_base;
    1.14  
    1.15 @@ -153,7 +153,7 @@
    1.16     the initialisation of a program by the C library which requires a region
    1.17     mapper. */
    1.18  
    1.19 -long InternalPager::attach(address_t *start, offset_t size, map_flags_t flags,
    1.20 +long InternalPager::attach(address_t *start, address_t size, map_flags_t flags,
    1.21                             l4_cap_idx_t ds, address_t offset,
    1.22                             unsigned char align)
    1.23  {
    1.24 @@ -164,8 +164,8 @@
    1.25    if (align < L4_PAGESHIFT)
    1.26      align = L4_PAGESHIFT;
    1.27  
    1.28 -  offset_t increment = 1UL << align;
    1.29 -  offset_t region_size = round(size, increment);
    1.30 +  address_t increment = 1UL << align;
    1.31 +  address_t region_size = round(size, increment);
    1.32  
    1.33    /* Either attempt to find an address for the specified region, starting from
    1.34       any indicated address. */