Changeset aa85487 in mainline for kernel/generic/src/mm


Ignore:
Timestamp:
2010-03-07T15:11:56Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aadf01e
Parents:
2e99277 (diff), 137691a (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, revision 308

Location:
kernel/generic/src/mm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/src/mm/as.c

    r2e99277 raa85487  
    784784{
    785785        as_area_t *area;
    786         uintptr_t base;
    787786        link_t *cur;
    788787        ipl_t ipl;
    … …  
    813812                return ENOTSUP;
    814813        }
    815 
    816         base = area->base;
    817814
    818815        /*
    … …  
    952949        if (!THREAD)
    953950                return AS_PF_FAULT;
    954                
    955         ASSERT(AS);
    956 
     951       
     952        if (!AS)
     953                return AS_PF_FAULT;
     954       
    957955        mutex_lock(&AS->lock);
    958         area = find_area_and_lock(AS, page);   
     956        area = find_area_and_lock(AS, page);
    959957        if (!area) {
    960958                /*

  • kernel/generic/src/mm/backend_elf.c

    r2e99277 raa85487  
    232232void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
    233233{
    234         elf_header_t *elf = area->backend_data.elf;
    235234        elf_segment_header_t *entry = area->backend_data.segment;
    236         uintptr_t base, start_anon;
    237         size_t i;
     235        uintptr_t start_anon;
    238236
    239237        ASSERT((page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) &&
    240238            (page < entry->p_vaddr + entry->p_memsz));
    241         i = (page - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
    242         base = (uintptr_t) (((void *) elf) +
    243             ALIGN_DOWN(entry->p_offset, FRAME_SIZE));
    244239        start_anon = entry->p_vaddr + entry->p_filesz;
    245240
    … …  
    257252                 * lower part is backed by the ELF image and the upper is
    258253                 * anonymous). In any case, a frame needs to be freed.
    259                  */ 
     254                 */
    260255                frame_free(frame);
    261256        }

  • kernel/generic/src/mm/slab.c

    r2e99277 raa85487  
    130130/** Caches for malloc */
    131131static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1];
    132 static char *malloc_names[] =  {
     132static const char *malloc_names[] =  {
    133133        "malloc-16",
    134134        "malloc-32",
    … …  
    571571
    572572/** Initialize allocated memory as a slab cache */
    573 static void
    574 _slab_cache_create(slab_cache_t *cache, char *name, size_t size, size_t align,
    575     int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj),
    576     int flags)
     573static void _slab_cache_create(slab_cache_t *cache, const char *name,
     574    size_t size, size_t align, int (*constructor)(void *obj, int kmflag),
     575    int (*destructor)(void *obj), int flags)
    577576{
    578577        int pages;
    … …  
    631630
    632631/** Create slab cache  */
    633 slab_cache_t *
    634 slab_cache_create(char *name, size_t size, size_t align,
     632slab_cache_t *slab_cache_create(const char *name, size_t size, size_t align,
    635633    int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj),
    636634    int flags)
    … …  
    853851                cache = list_get_instance(cur, slab_cache_t, link);
    854852
    855                 char *name = cache->name;
     853                const char *name = cache->name;
    856854                uint8_t order = cache->order;
    857855                size_t size = cache->size;
    … …  
    896894                    NULL, NULL, SLAB_CACHE_MAGDEFERRED);
    897895        }
    898 #ifdef CONFIG_DEBUG       
     896#ifdef CONFIG_DEBUG
    899897        _slab_initialized = 1;
    900898#endif
Note: See TracChangeset for help on using the changeset viewer.