diff options
| author | Aleksa Vuckovic <aleksa@vuckovic.cc> | 2023-02-22 18:36:16 +0100 |
|---|---|---|
| committer | Aleksa Vuckovic <aleksa@vuckovic.cc> | 2023-02-22 18:36:16 +0100 |
| commit | 53069ae43ea997d51d2b985a26fffdb86a59b023 (patch) | |
| tree | 173e9a3c452e2116db9a82f06de3761b97d6605b /kernel/include | |
| parent | 57e6722453c27d35a3b02309ce21263d225a23e3 (diff) | |
spinlocks in printf
Diffstat (limited to 'kernel/include')
| -rw-r--r-- | kernel/include/apic.h | 3 | ||||
| -rw-r--r-- | kernel/include/atomic.h | 4 | ||||
| -rw-r--r-- | kernel/include/libk/serial_stdio.h | 3 | ||||
| -rw-r--r-- | kernel/include/libk/stdio.h | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/kernel/include/apic.h b/kernel/include/apic.h index 700d6d1..0025e53 100644 --- a/kernel/include/apic.h +++ b/kernel/include/apic.h @@ -8,7 +8,8 @@ uint8_t curr_cpu_apic_id(void); void init_ap_cpus(void); extern mutex_t cnt_lock; -extern uint32_t cnt; +extern uint32_t ap_cnt; +extern uint32_t bspdone; extern uint32_t ioapic_addr; extern uint64_t lapic_addr; extern uint32_t numcores; diff --git a/kernel/include/atomic.h b/kernel/include/atomic.h index 5ddc620..01a2433 100644 --- a/kernel/include/atomic.h +++ b/kernel/include/atomic.h @@ -1,5 +1,5 @@ -#ifndef ATOMIC -#define ATOMIC +#ifndef ATOMIC_H +#define ATOMIC_H #include <types.h> diff --git a/kernel/include/libk/serial_stdio.h b/kernel/include/libk/serial_stdio.h index 5a4dda4..638d46a 100644 --- a/kernel/include/libk/serial_stdio.h +++ b/kernel/include/libk/serial_stdio.h @@ -2,6 +2,7 @@ #define SERIAL_STDIO_H #include <types.h> +#include <atomic.h> void serial_print_char(char c); void serial_print_string(const char* s); @@ -10,4 +11,6 @@ void serial_print_hex(uint64_t num); void serial_printf(const char *s, ...); void serial_vprintf(const char *s, va_list list); +extern mutex_t serial_stdio_lock; + #endif diff --git a/kernel/include/libk/stdio.h b/kernel/include/libk/stdio.h index 64d16f1..f7b204e 100644 --- a/kernel/include/libk/stdio.h +++ b/kernel/include/libk/stdio.h @@ -2,6 +2,7 @@ #define STDIO_H #include <types.h> +#include <atomic.h> void print_char(char c); void print_string(const char* s); @@ -10,4 +11,6 @@ void print_hex(uint64_t num); void printf(const char *s, ...); void vprintf(const char *s, va_list list); +extern mutex_t stdio_lock; + #endif |