Changeset c0699467 in mainline for kernel/arch/amd64

Timestamp:

2011-08-09T18:08:23Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b538ca5c

Parents:

3666d386

Message:

do not provide general access to kernel headers from uspace, only allow specific headers to be accessed or shared
externalize headers which serve as kernel/uspace API/ABI into a special tree

Location:

kernel/arch/amd64

Files:

• include/context.h (modified) (2 diffs)
• include/istate.h (modified) (1 diff)
• include/mm/frame.h (modified) (2 diffs)
• include/mm/page.h (modified) (2 diffs)
• src/userspace.c (modified) (1 diff)

kernel/arch/amd64/include/context.h

@@ -36 +36 @@
 #define KERN_amd64_CONTEXT_H_
 
-#ifdef KERNEL
-
 #include <typedefs.h>
 
@@ -52 +50 @@
                 (c)->rbp = 0; \
         } while (0)
-
-#endif /* KERNEL */
 
 /* We include only registers that must be preserved

kernel/arch/amd64/include/istate.h

@@ -36 +36 @@
 #define KERN_amd64_ISTATE_H_
 
-#ifdef KERNEL
-
-#include <typedefs.h>
 #include <trace.h>
-
-#else /* KERNEL */
-
-#include <sys/types.h>
-
-#define NO_TRACE
-
-#endif /* KERNEL */
 
 /** This is passed to interrupt handlers */

kernel/arch/amd64/include/mm/frame.h

@@ -39 +39 @@
 #define FRAME_SIZE   (1 << FRAME_WIDTH)
 
-#ifdef KERNEL
 #ifndef __ASM__
 
@@ -49 +48 @@
 
 #endif /* __ASM__ */
-#endif /* KERNEL */
 
 #endif

kernel/arch/amd64/include/mm/page.h

@@ -50 +50 @@
 #define PAGE_WIDTH  FRAME_WIDTH
 #define PAGE_SIZE   FRAME_SIZE
-
-#ifdef KERNEL
 
 #ifndef __ASM__
@@ -231 +229 @@
 #endif /* __ASM__ */
 
-#endif /* KERNEL */
-
 #endif
 

kernel/arch/amd64/src/userspace.c

@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch.h>
-#include <proc/uarg.h>
+#include <abi/proc/uarg.h>
 #include <mm/as.h>
-
 
 /** Enter userspace