Changeset 97c7682 in mainline for uspace/lib/fb/imgmap.c

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/fb/imgmap.c (modified) (1 diff)

uspace/lib/fb/imgmap.c

@@ -420 +420 @@
         
         if ((flags & IMGMAP_FLAG_SHARED) == IMGMAP_FLAG_SHARED) {
-                imgmap = (imgmap_t *) as_area_create((void *) -1, size,
+                imgmap = (imgmap_t *) as_area_create(AS_AREA_ANY, size,
                     AS_AREA_READ | AS_AREA_WRITE);
-                if (imgmap == (void *) -1)
+                if (imgmap == AS_MAP_FAILED)
                         return NULL;
         } else {