Merge branch 'rebase' of git://git.l4dev.org/~amit/codezero into devel

Conflicts:
	config/cml/examples/posix/two_posix.cml
This commit is contained in:
Bahadir Balban
2009-12-04 13:18:14 +02:00
5 changed files with 308 additions and 675 deletions

View File

@@ -51,7 +51,7 @@ int user_mutex_test(void)
*/
if ((int)(base = mmap(0, map_size, PROT_READ | PROT_WRITE,
MAP_SHARED | MAP_ANONYMOUS, 0, 0)) < 0) {
printf("%s: mmap for extended ipc buffer failed: %d\n",
printf("%s: mmap for extended ipc buffer failed: %x\n",
__FUNCTION__, (int)base);
goto out_err;
} else