From 1ee1d0cbab735cd0849fefaa1ee62ae8fe83d7a5 Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Fri, 29 Nov 2013 03:47:38 +0100 Subject: [PATCH] kernel, drivers: Fix gcc2 build --- src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp | 2 +- src/system/kernel/locks/lock.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp b/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp index d001e0e2be..68af7542ac 100644 --- a/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp +++ b/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp @@ -676,7 +676,7 @@ AcpiOsCreateLock(ACPI_SPINLOCK *outHandle) if (*outHandle == NULL) return AE_NO_MEMORY; - **outHandle = B_SPINLOCK_INITIALIZER; + B_INITIALIZE_SPINLOCK(*outHandle); return AE_OK; } diff --git a/src/system/kernel/locks/lock.cpp b/src/system/kernel/locks/lock.cpp index 3240549fbd..facf6268e5 100644 --- a/src/system/kernel/locks/lock.cpp +++ b/src/system/kernel/locks/lock.cpp @@ -231,7 +231,7 @@ rw_lock_init(rw_lock* lock, const char* name) { lock->name = name; lock->waiters = NULL; - lock->lock = B_SPINLOCK_INITIALIZER; + B_INITIALIZE_SPINLOCK(&lock->lock); lock->holder = -1; lock->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->waiters = NULL; - lock->lock = B_SPINLOCK_INITIALIZER; + B_INITIALIZE_SPINLOCK(&lock->lock); lock->holder = -1; lock->count = 0; lock->owner_count = 0; @@ -574,7 +574,7 @@ mutex_init(mutex* lock, const char *name) { lock->name = name; lock->waiters = NULL; - lock->lock = B_SPINLOCK_INITIALIZER; + B_INITIALIZE_SPINLOCK(&lock->lock); #if KDEBUG lock->holder = -1; #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->waiters = NULL; - lock->lock = B_SPINLOCK_INITIALIZER; + B_INITIALIZE_SPINLOCK(&lock->lock); #if KDEBUG lock->holder = -1; #else