Changeset dc747e3 in mainline for generic/src/mm

Timestamp:

2005-12-15T10:27:59Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7dd2561

Parents:

3fc03fd

Message:

Add SPINLOCK_DECLARE and SPINLOCK_INITIALIZE macros.
SPINLOCK_DECLARE is to be used instead of direct spinlock_t declarations
in dynamically allocated structures on which spinlock_initialize() is called after
their creation.
SPINLOCK_INITIALIZE is to be used instead of direct spinlock_t declarations
of global spinlocks. It declares and initializes the spinlock.
Moreover, both macros are empty on UP so that -Wall warnings about unused structures
get supressed.

Location:

generic/src/mm

Files:

• frame.c (modified) (2 diffs)
• heap.c (modified) (1 diff)
• tlb.c (modified) (1 diff)

generic/src/mm/frame.c

@@ -42 +42 @@
 #include <align.h>
 
-spinlock_t zone_head_lock;       /**< this lock protects zone_head list */
-link_t zone_head;                /**< list of all zones in the system */
+SPINLOCK_INITIALIZE(zone_head_lock);    /**< this lock protects zone_head list */
+link_t zone_head;                       /**< list of all zones in the system */
 
 /** Blacklist containing non-available areas of memory.
@@ -243 +243 @@
 void zone_init(void)
 {
-        spinlock_initialize(&zone_head_lock, "zone_head_lock");
         list_initialize(&zone_head);
 }

generic/src/mm/heap.c

@@ -44 +44 @@
 
 static chunk_t *chunk0;
-static spinlock_t heaplock;
+SPINLOCK_INITIALIZE(heaplock);
 
 void early_heap_init(__address heap, size_t size)
 {
-        spinlock_initialize(&heaplock, "heap_lock");
         memsetb(heap, size, 0);
         chunk0 = (chunk_t *) heap;

generic/src/mm/tlb.c

@@ -38 +38 @@
 #include <panic.h>
 
-#ifdef CONFIG_SMP
-static spinlock_t tlblock;
-#endif
+SPINLOCK_INITIALIZE(tlblock);
 
 void tlb_init(void)
 {
-        if (config.cpu_active == 1)
-                spinlock_initialize(&tlblock, "tlb_lock");
-
         tlb_arch_init();
 }