Changeset 97c7682 in mainline for uspace/drv/bus/usb/uhci/utils/malloc32.h

Timestamp:

2012-07-14T11:18:40Z (12 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/drv/bus/usb/uhci/utils/malloc32.h (modified) (2 diffs)

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -36 +36 @@
 
 #include <assert.h>
+#include <unistd.h>
 #include <errno.h>
 #include <malloc.h>
@@ -98 +99 @@
 static inline void * get_page(void)
 {
-        void *address = as_area_create((void *) -1, UHCI_REQUIRED_PAGE_SIZE,
+        void *address = as_area_create(AS_AREA_ANY, UHCI_REQUIRED_PAGE_SIZE,
             AS_AREA_READ | AS_AREA_WRITE);
-        if (address == (void *) -1)
+        if (address == AS_MAP_FAILED)
                 return NULL;