From 330aa15e3e4a705eb8d168bc9c76af9b1b768dfc Mon Sep 17 00:00:00 2001 From: Miguel Date: Thu, 27 Sep 2018 01:43:43 +0200 Subject: user space compilation of fool stack --- kernel/kernel.h | 2 -- kernel/log.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'kernel') diff --git a/kernel/kernel.h b/kernel/kernel.h index d0c14f6..a296b18 100644 --- a/kernel/kernel.h +++ b/kernel/kernel.h @@ -46,8 +46,6 @@ REFERENCES #define SPINLOCK_ALLOC 1 #define SPINLOCK_PID 2 -#define S1(x) #x -#define S2(x) S1(x) #define SMP_MAX_PROC 16 // 16 (together with bsp) We can currently only address a maximum of 16 cpus via ipis! diff --git a/kernel/log.h b/kernel/log.h index 930aa53..4e25bef 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -32,6 +32,9 @@ void log(bool color,char *module_name, int prio, char *format_string, ...); #define LOG_LABEL_TEST " \033[42;37m [TEST] \033[37;40m " #endif +#define S1(x) #x +#define S2(x) S1(x) + #define klog(...) log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__), 10, LOG_LABEL_INFO __VA_ARGS__) #define kpanic(...) {log(FOOLOS_LOG_COLOR,__FILE__ ":" S2(__LINE__) ,0, LOG_LABEL_PANIC __VA_ARGS__ ); while(1);} -- cgit v1.2.3