sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-12 10:53:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into fix-kmalloc

Browse Source
This commit is contained in:
Bahadir Balban
2009-06-01 15:08:28 +03:00
parent 53f54f2328 87eae2c941
commit 1de77f1b93
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/mutex.c
View File

@@ -199,7 +199,6 @@ int mutex_control_unlock(unsigned long mutex_address)
/* Search for the mutex queue */
if (!(mutex_queue = mutex_control_find(mutex_address))) {
mutex_queue_head_unlock();
/* No such mutex, create one and sleep on it */
if (!(mutex_queue = mutex_control_create(mutex_address))) {

8
tasks/test0/src/exectest.c
View File

@@ -16,7 +16,7 @@ extern char _end_test_exec[];
int exectest(void)
{
int fd;
int fd, err;
void *exec_start = (void *)_start_test_exec;
unsigned long size = _end_test_exec - _start_test_exec;
int left, cnt;
@@ -28,6 +28,7 @@ int exectest(void)
/* First create a new file and write the executable data to that file */
if ((fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU)) < 0) {
err = errno;
test_printf("OPEN: %d\n", errno);
goto out_err;
}
@@ -40,7 +41,7 @@ int exectest(void)
left -= cnt;
}
if (close(fd) < 0)
if ((err = close(fd)) < 0)
goto out_err;
/* Set up some arguments */
@@ -51,9 +52,10 @@ int exectest(void)
argv[4] = 0;
/* Execute the file */
execve(filename, argv, 0);
err = execve(filename, argv, 0);
out_err:
printf("EXECVE failed with %d\n", err);
printf("EXECVE TEST -- FAILED --\n");
return 0;
}