i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel, drivers: Fix gcc2 build

Browse Source
This commit is contained in:
Pawel Dziepak
2013-11-29 03:47:38 +01:00
parent 3514fd77f7
commit 1ee1d0cbab
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
+1 -1
View File
@@ -676,7 +676,7 @@ AcpiOsCreateLock(ACPI_SPINLOCK *outHandle)
if (*outHandle == NULL) if (*outHandle == NULL)
return AE_NO_MEMORY; return AE_NO_MEMORY;
**outHandle = B_SPINLOCK_INITIALIZER; B_INITIALIZE_SPINLOCK(*outHandle);
return AE_OK; return AE_OK;
} }
src/system/kernel/locks/lock.cpp
+4 -4
View File
@@ -231,7 +231,7 @@ rw_lock_init(rw_lock* lock, const char* name)
{ {
lock->name = name; lock->name = name;
lock->waiters = NULL; lock->waiters = NULL;
lock->lock = B_SPINLOCK_INITIALIZER; B_INITIALIZE_SPINLOCK(&lock->lock);
lock->holder = -1; lock->holder = -1;
lock->count = 0; lock->count = 0;
lock->owner_count = 0; lock->owner_count = 0;
@@ -249,7 +249,7 @@ rw_lock_init_etc(rw_lock* lock, const char* name, uint32 flags)
{ {
lock->name = (flags & RW_LOCK_FLAG_CLONE_NAME) != 0 ? strdup(name) : name; lock->name = (flags & RW_LOCK_FLAG_CLONE_NAME) != 0 ? strdup(name) : name;
lock->waiters = NULL; lock->waiters = NULL;
lock->lock = B_SPINLOCK_INITIALIZER; B_INITIALIZE_SPINLOCK(&lock->lock);
lock->holder = -1; lock->holder = -1;
lock->count = 0; lock->count = 0;
lock->owner_count = 0; lock->owner_count = 0;
@@ -574,7 +574,7 @@ mutex_init(mutex* lock, const char *name)
{ {
lock->name = name; lock->name = name;
lock->waiters = NULL; lock->waiters = NULL;
lock->lock = B_SPINLOCK_INITIALIZER; B_INITIALIZE_SPINLOCK(&lock->lock);
#if KDEBUG #if KDEBUG
lock->holder = -1; lock->holder = -1;
#else #else
@@ -593,7 +593,7 @@ mutex_init_etc(mutex* lock, const char *name, uint32 flags)
{ {
lock->name = (flags & MUTEX_FLAG_CLONE_NAME) != 0 ? strdup(name) : name; lock->name = (flags & MUTEX_FLAG_CLONE_NAME) != 0 ? strdup(name) : name;
lock->waiters = NULL; lock->waiters = NULL;
lock->lock = B_SPINLOCK_INITIALIZER; B_INITIALIZE_SPINLOCK(&lock->lock);
#if KDEBUG #if KDEBUG
lock->holder = -1; lock->holder = -1;
#else #else