diff options
author | Richard Braun <rbraun@sceen.net> | 2012-11-03 17:30:15 +0100 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2012-11-03 17:30:15 +0100 |
commit | 27484e07cdd0be148743cb8e4acd99e96264eca9 (patch) | |
tree | 3d32b0b274a879e5f814ff366b7d8bd6f2c973ba /arch/x86/machine/lapic.c | |
parent | 6b04aaae27ef9cc26487da1dd2acf75f3b49e3f5 (diff) |
Merge lib into kern
There are no precise enough criteria to justify the separation of these
two directories.
Diffstat (limited to 'arch/x86/machine/lapic.c')
-rw-r--r-- | arch/x86/machine/lapic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/machine/lapic.c b/arch/x86/machine/lapic.c index 03a2820..c2a2b3a 100644 --- a/arch/x86/machine/lapic.c +++ b/arch/x86/machine/lapic.c @@ -16,11 +16,12 @@ */ #include <kern/init.h> +#include <kern/macros.h> #include <kern/panic.h> #include <kern/param.h> #include <kern/printk.h> -#include <lib/macros.h> -#include <lib/stdint.h> +#include <kern/stddef.h> +#include <kern/stdint.h> #include <machine/cpu.h> #include <machine/lapic.h> #include <machine/pmap.h> |