diff options
author | Richard Braun <rbraun@sceen.net> | 2017-09-02 23:03:40 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2017-09-02 23:03:40 +0200 |
commit | 608cf884efd9bb0ef6a308814fd22b1c8688fabf (patch) | |
tree | 67a64a116aae6e3ca49e7eaf9a31a90f9e9ef51f /kern | |
parent | ca45d38bbf535f1dd23df9b71f85cd9c820e0e69 (diff) |
Rework the build system
Diffstat (limited to 'kern')
-rw-r--r-- | kern/kmem.c | 4 | ||||
-rw-r--r-- | kern/log.c | 4 | ||||
-rw-r--r-- | kern/mutex.h | 14 | ||||
-rw-r--r-- | kern/mutex_types.h | 10 | ||||
-rw-r--r-- | kern/shell.h | 6 | ||||
-rw-r--r-- | kern/shutdown.c | 4 | ||||
-rw-r--r-- | kern/syscnt.c | 4 | ||||
-rw-r--r-- | kern/task.c | 4 | ||||
-rw-r--r-- | kern/thread.c | 4 |
9 files changed, 27 insertions, 27 deletions
diff --git a/kern/kmem.c b/kern/kmem.c index 5423c0a0..a811cc56 100644 --- a/kern/kmem.c +++ b/kern/kmem.c @@ -1123,7 +1123,7 @@ kmem_cache_info(struct kmem_cache *cache) mutex_unlock(&cache->lock); } -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL static struct kmem_cache * kmem_lookup_cache(const char *name) @@ -1184,7 +1184,7 @@ INIT_OP_DEFINE(kmem_setup_shell, INIT_OP_DEP(shell_setup, true), INIT_OP_DEP(thread_setup, true)); -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ static int __init kmem_bootstrap(void) @@ -334,7 +334,7 @@ log_run(void *arg) } } -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL static void log_dump(unsigned int level) @@ -412,7 +412,7 @@ INIT_OP_DEFINE(log_setup_shell, INIT_OP_DEP(log_setup, true), INIT_OP_DEP(shell_setup, true)); -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ static int __init log_setup(void) diff --git a/kern/mutex.h b/kern/mutex.h index 8cb7aaca..c0a2c6e5 100644 --- a/kern/mutex.h +++ b/kern/mutex.h @@ -23,18 +23,16 @@ #ifndef _KERN_MUTEX_H #define _KERN_MUTEX_H -#if defined(X15_MUTEX_PI) && defined(X15_MUTEX_ADAPTIVE) -#error "only one of X15_MUTEX_PI and X15_MUTEX_ADAPTIVE may be defined" -#endif - #include <stdint.h> -#if defined(X15_MUTEX_PI) -#include <kern/mutex/mutex_pi_i.h> -#elif defined(X15_MUTEX_ADAPTIVE) +#if defined(X15_USE_MUTEX_ADAPTIVE) #include <kern/mutex/mutex_adaptive_i.h> -#else +#elif defined(X15_USE_MUTEX_PI) +#include <kern/mutex/mutex_pi_i.h> +#elif defined(X15_USE_MUTEX_PLAIN) #include <kern/mutex/mutex_plain_i.h> +#else +#error "unknown mutex implementation" #endif #include <kern/init.h> diff --git a/kern/mutex_types.h b/kern/mutex_types.h index eb2bc339..f0f8240c 100644 --- a/kern/mutex_types.h +++ b/kern/mutex_types.h @@ -21,12 +21,14 @@ #ifndef _KERN_MUTEX_TYPES_H #define _KERN_MUTEX_TYPES_H -#if defined(X15_MUTEX_PI) -#include <kern/mutex/mutex_pi_types.h> -#elif defined(X15_MUTEX_ADAPTIVE) +#if defined(X15_USE_MUTEX_ADAPTIVE) #include <kern/mutex/mutex_adaptive_types.h> -#else +#elif defined(X15_USE_MUTEX_PI) +#include <kern/mutex/mutex_pi_types.h> +#elif defined(X15_USE_MUTEX_PLAIN) #include <kern/mutex/mutex_plain_types.h> +#else +#error "unknown mutex implementation" #endif #endif /* _KERN_MUTEX_TYPES_H */ diff --git a/kern/shell.h b/kern/shell.h index cf56cebf..f6377f07 100644 --- a/kern/shell.h +++ b/kern/shell.h @@ -25,7 +25,7 @@ #include <kern/error.h> #include <kern/macros.h> -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL #define SHELL_REGISTER_CMDS(cmds) \ MACRO_BEGIN \ @@ -81,11 +81,11 @@ void shell_start(void); */ int shell_cmd_register(struct shell_cmd *cmd); -#else /* X15_SHELL */ +#else /* X15_ENABLE_SHELL */ #define SHELL_REGISTER_CMDS(cmds) #define shell_setup() #define shell_start() -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ /* * This init operation provides : diff --git a/kern/shutdown.c b/kern/shutdown.c index 1c950415..b85cb1cb 100644 --- a/kern/shutdown.c +++ b/kern/shutdown.c @@ -26,7 +26,7 @@ static struct plist shutdown_ops_list; -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL static void shutdown_shell_halt(int argc, char **argv) @@ -66,7 +66,7 @@ INIT_OP_DEFINE(shutdown_setup_shell, INIT_OP_DEP(shell_setup, true), INIT_OP_DEP(shutdown_setup, true)); -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ static int __init shutdown_bootstrap(void) diff --git a/kern/syscnt.c b/kern/syscnt.c index 0e3aff70..f1cc95a9 100644 --- a/kern/syscnt.c +++ b/kern/syscnt.c @@ -33,7 +33,7 @@ static struct list syscnt_list; static struct mutex syscnt_lock; -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL static void syscnt_shell_info(int argc, char **argv) @@ -61,7 +61,7 @@ INIT_OP_DEFINE(syscnt_setup_shell, INIT_OP_DEP(shell_setup, true), INIT_OP_DEP(syscnt_setup, true)); -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ static int __init syscnt_setup(void) diff --git a/kern/task.c b/kern/task.c index ab82ad83..16210560 100644 --- a/kern/task.c +++ b/kern/task.c @@ -64,7 +64,7 @@ task_init(struct task *task, const char *name, struct vm_map *map) strlcpy(task->name, name, sizeof(task->name)); } -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL static void task_shell_info(int argc, char *argv[]) @@ -112,7 +112,7 @@ INIT_OP_DEFINE(task_setup_shell, INIT_OP_DEP(task_setup, true), INIT_OP_DEP(thread_setup, true)); -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ static int __init task_setup(void) diff --git a/kern/thread.c b/kern/thread.c index 9ee9b99e..b6a44bb8 100644 --- a/kern/thread.c +++ b/kern/thread.c @@ -2185,7 +2185,7 @@ thread_setup_runq(struct thread_runq *runq) thread_setup_idler(runq); } -#ifdef X15_SHELL +#ifdef X15_ENABLE_SHELL /* * This function is meant for debugging only. As a result, it uses a weak @@ -2261,7 +2261,7 @@ INIT_OP_DEFINE(thread_setup_shell, INIT_OP_DEP(task_setup, true), INIT_OP_DEP(thread_setup, true)); -#endif /* X15_SHELL */ +#endif /* X15_ENABLE_SHELL */ static void __init thread_setup_common(unsigned int cpu) |