Changeset 2c2d54a in mainline for uspace/app


Ignore:
Timestamp:
2016-09-02T17:58:05Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4c3602c4
Parents:
4bf0926e (diff), 3233adb (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/pager

Location:
uspace/app
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/Makefile

    r4bf0926e r2c2d54a  
    7474        mm/malloc3.c \
    7575        mm/mapping1.c \
     76        mm/pager1.c \
    7677        hw/misc/virtchar1.c \
    7778        hw/serial/serial1.c

  • uspace/app/tester/mm/common.c

    r4bf0926e r2c2d54a  
    341341       
    342342        area->addr = as_area_create(AS_AREA_ANY, size,
    343             AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE);
     343            AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE,
     344            AS_AREA_UNPAGED);
    344345        if (area->addr == AS_MAP_FAILED) {
    345346                free(area);

  • uspace/app/tester/mm/mapping1.c

    r4bf0926e r2c2d54a  
    4343       
    4444        void *result = as_area_create(AS_AREA_ANY, size,
    45             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
     45            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, AS_AREA_UNPAGED);
    4646        if (result == AS_MAP_FAILED)
    4747                return NULL;

  • uspace/app/tester/tester.c

    r4bf0926e r2c2d54a  
    7474#include "mm/malloc3.def"
    7575#include "mm/mapping1.def"
     76#include "mm/pager1.def"
    7677#include "hw/serial/serial1.def"
    7778#include "hw/misc/virtchar1.def"

  • uspace/app/tester/tester.h

    r4bf0926e r2c2d54a  
    107107extern const char *test_malloc3(void);
    108108extern const char *test_mapping1(void);
     109extern const char *test_pager1(void);
    109110extern const char *test_serial1(void);
    110111extern const char *test_virtchar1(void);

  • uspace/app/trace/syscalls.c

    r4bf0926e r2c2d54a  
    4949    [SYS_FUTEX_WAKEUP] = { "futex_wakeup",              1,      V_ERRNO },
    5050
    51     [SYS_AS_AREA_CREATE] = { "as_area_create",          3,      V_ERRNO },
     51    [SYS_AS_AREA_CREATE] = { "as_area_create",          5,      V_ERRNO },
    5252    [SYS_AS_AREA_RESIZE] = { "as_area_resize",          3,      V_ERRNO },
    5353    [SYS_AS_AREA_DESTROY] = { "as_area_destroy",        1,      V_ERRNO },
Note: See TracChangeset for help on using the changeset viewer.