diff options
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/kmem.c | 2 | ||||
| -rw-r--r-- | kern/macros.h | 3 | ||||
| -rw-r--r-- | kern/param.h | 23 | ||||
| -rw-r--r-- | kern/sref.c | 1 | ||||
| -rw-r--r-- | kern/thread.c | 2 |
5 files changed, 5 insertions, 26 deletions
diff --git a/kern/kmem.c b/kern/kmem.c index 90557310..572df4fe 100644 --- a/kern/kmem.c +++ b/kern/kmem.c @@ -57,10 +57,10 @@ #include <kern/macros.h> #include <kern/mutex.h> #include <kern/panic.h> -#include <kern/param.h> #include <kern/shell.h> #include <kern/thread.h> #include <machine/cpu.h> +#include <machine/page.h> #include <machine/pmap.h> #include <vm/vm_kmem.h> #include <vm/vm_page.h> diff --git a/kern/macros.h b/kern/macros.h index 63ded053..743bdc0d 100644 --- a/kern/macros.h +++ b/kern/macros.h @@ -16,6 +16,9 @@ * * * Helper macros. + * + * This file is a top header in the inclusion hierarchy, and shouldn't include + * other headers that may cause circular dependencies. */ #ifndef _KERN_MACROS_H diff --git a/kern/param.h b/kern/param.h deleted file mode 100644 index d0061728..00000000 --- a/kern/param.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2012 Richard Braun. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef _KERN_PARAM_H -#define _KERN_PARAM_H - -#include <machine/param.h> - -#endif /* _KERN_PARAM_H */ diff --git a/kern/sref.c b/kern/sref.c index bc3f9e98..7c4f14e1 100644 --- a/kern/sref.c +++ b/kern/sref.c @@ -53,7 +53,6 @@ #include <kern/macros.h> #include <kern/mutex.h> #include <kern/panic.h> -#include <kern/param.h> #include <kern/percpu.h> #include <kern/spinlock.h> #include <kern/sref.h> diff --git a/kern/thread.c b/kern/thread.c index cd0717c4..eb0f1eb5 100644 --- a/kern/thread.c +++ b/kern/thread.c @@ -99,7 +99,6 @@ #include <kern/macros.h> #include <kern/mutex.h> #include <kern/panic.h> -#include <kern/param.h> #include <kern/percpu.h> #include <kern/shell.h> #include <kern/sleepq.h> @@ -111,6 +110,7 @@ #include <kern/turnstile.h> #include <kern/work.h> #include <machine/cpu.h> +#include <machine/page.h> #include <machine/pmap.h> #include <machine/tcb.h> #include <vm/vm_map.h> |