Changeset 371bd7d in mainline for kernel/generic/include/mm


Ignore:
Timestamp:
2010-03-27T09:22:17Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
36a75a2
Parents:
cd82bb1 (diff), eaf22d4 (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.

Location:
kernel/generic/include/mm
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/mm/as.h

    rcd82bb1 r371bd7d  
    3636#define KERN_AS_H_
    3737
     38#ifdef KERNEL
     39        #include <typedefs.h>
     40#else
     41        #include <sys/types.h>
     42#endif
     43
    3844/** Address space area flags. */
    3945#define AS_AREA_READ            1
    … …  
    4248#define AS_AREA_CACHEABLE       8
    4349
     50/** Address space area info exported to userspace. */
     51typedef struct {
     52        /** Starting address */
     53        uintptr_t start_addr;
     54
     55        /** Area size */
     56        size_t size;
     57
     58        /** Area flags */
     59        int flags;
     60} as_area_info_t;
     61
    4462#ifdef KERNEL
    4563
    … …  
    4765#include <arch/mm/as.h>
    4866#include <arch/mm/asid.h>
    49 #include <arch/types.h>
     67#include <typedefs.h>
    5068#include <synch/spinlock.h>
    5169#include <synch/mutex.h>
    … …  
    268286
    269287/* Introspection functions. */
     288extern void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize);
    270289extern void as_print(as_t *as);
    271290

  • kernel/generic/include/mm/buddy.h

    rcd82bb1 r371bd7d  
    3636#define KERN_BUDDY_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <adt/list.h>
    4040

  • kernel/generic/include/mm/frame.h

    rcd82bb1 r371bd7d  
    3737#define KERN_FRAME_H_
    3838
    39 #include <arch/types.h>
     39#include <typedefs.h>
    4040#include <adt/list.h>
    4141#include <mm/buddy.h>

  • kernel/generic/include/mm/page.h

    rcd82bb1 r371bd7d  
    3636#define KERN_PAGE_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <mm/as.h>
    4040#include <memstr.h>

  • kernel/generic/include/mm/slab.h

    rcd82bb1 r371bd7d  
    8686
    8787typedef struct {
    88         char *name;
     88        const char *name;
    8989       
    9090        link_t link;
    … …  
    123123} slab_cache_t;
    124124
    125 extern slab_cache_t *slab_cache_create(char *, size_t, size_t,
     125extern slab_cache_t *slab_cache_create(const char *, size_t, size_t,
    126126    int (*)(void *, int), int (*)(void *), int);
    127127extern void slab_cache_destroy(slab_cache_t *);

  • kernel/generic/include/mm/tlb.h

    rcd82bb1 r371bd7d  
    3737
    3838#include <arch/mm/asid.h>
    39 #include <arch/types.h>
     39#include <typedefs.h>
    4040
    4141/**
Note: See TracChangeset for help on using the changeset viewer.