Changeset 8fc0d455 in mainline for arch/amd64/include/pm.h

Timestamp:

2005-08-30T17:50:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

9c0a9b3

Parents:

b45aa23

Message:

Code cleanup.

File:

• arch/amd64/include/pm.h (modified) (4 diffs)

arch/amd64/include/pm.h

@@ -27 +27 @@
  */
 
-#ifndef __PM_H__
-#define __PM_H__
+#ifndef __amd64_PM_H__
+#define __amd64_PM_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
-#include <arch/context.h>
+#ifndef __ASM__
+# include <arch/types.h>
+# include <typedefs.h>
+# include <arch/context.h>
+#endif
 
 #define IDT_ITEMS 64
@@ -42 +44 @@
 #define UTEXT_DES       3
 #define UDATA_DES       4
-#define TSS_DES         5
+#define KTEXT32_DES     5
+#define TSS_DES         6
 
 #define selector(des)   ((des)<<3)
@@ -61 +64 @@
 
 #define IO_MAP_BASE     (104)
+
+#ifndef __ASM__
 
 struct ptr_16_32 {
@@ -146 +151 @@
 extern void tss_initialize(struct tss *t);
 
+#endif /* __ASM__ */
+
 #endif