From 9a25c2363504942061c56d37499e99e3b1689be5 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Thu, 12 Oct 2000 11:13:27 +0000
Subject: [PATCH] Moved the definitions of AST_PENDING and AST_RESCHED to the
 correct place.

---
 sys/amd64/amd64/genassym.c | 5 +++--
 sys/amd64/include/cpu.h    | 6 ++++++
 sys/i386/i386/genassym.c   | 5 +++--
 sys/i386/include/cpu.h     | 6 ++++++
 sys/i386/include/ipl.h     | 6 ------
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 0566dd7e0f45..431a081733f9 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -55,7 +55,6 @@
 #ifdef KTR_PERCPU
 #include <sys/ktr.h>
 #endif
-#include <machine/frame.h>
 #include <machine/bootinfo.h>
 #include <machine/tss.h>
 #include <sys/vmmeter.h>
@@ -73,7 +72,7 @@
 #ifdef SMP
 #include <machine/apic.h>
 #endif
-#include <machine/segments.h>
+#include <machine/cpu.h>
 #include <machine/sigframe.h>
 #include <machine/globaldata.h>
 #include <machine/vm86.h>
@@ -182,6 +181,8 @@ ASSYM(GD_SWITCHTICKS, offsetof(struct globaldata, gd_switchticks));
 ASSYM(GD_COMMON_TSSD, offsetof(struct globaldata, gd_common_tssd));
 ASSYM(GD_TSS_GDT, offsetof(struct globaldata, gd_tss_gdt));
 ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending));
+ASSYM(AST_PENDING, AST_PENDING);
+ASSYM(AST_RESCHED, AST_RESCHED);
 ASSYM(GD_INTR_NESTING_LEVEL, offsetof(struct globaldata, gd_intr_nesting_level));
 
 #ifdef USER_LDT
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index d35b94077130..74a260dcc8aa 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -64,6 +64,12 @@
 #define CLKF_INTR(framep)	(intr_nesting_level >= 2)
 #define	CLKF_PC(framep)		((framep)->cf_eip)
 
+/*
+ * astpending bits
+ */
+#define	AST_PENDING	0x00000001
+#define	AST_RESCHED	0x00000002
+
 /*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 0566dd7e0f45..431a081733f9 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -55,7 +55,6 @@
 #ifdef KTR_PERCPU
 #include <sys/ktr.h>
 #endif
-#include <machine/frame.h>
 #include <machine/bootinfo.h>
 #include <machine/tss.h>
 #include <sys/vmmeter.h>
@@ -73,7 +72,7 @@
 #ifdef SMP
 #include <machine/apic.h>
 #endif
-#include <machine/segments.h>
+#include <machine/cpu.h>
 #include <machine/sigframe.h>
 #include <machine/globaldata.h>
 #include <machine/vm86.h>
@@ -182,6 +181,8 @@ ASSYM(GD_SWITCHTICKS, offsetof(struct globaldata, gd_switchticks));
 ASSYM(GD_COMMON_TSSD, offsetof(struct globaldata, gd_common_tssd));
 ASSYM(GD_TSS_GDT, offsetof(struct globaldata, gd_tss_gdt));
 ASSYM(GD_ASTPENDING, offsetof(struct globaldata, gd_astpending));
+ASSYM(AST_PENDING, AST_PENDING);
+ASSYM(AST_RESCHED, AST_RESCHED);
 ASSYM(GD_INTR_NESTING_LEVEL, offsetof(struct globaldata, gd_intr_nesting_level));
 
 #ifdef USER_LDT
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index d35b94077130..74a260dcc8aa 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -64,6 +64,12 @@
 #define CLKF_INTR(framep)	(intr_nesting_level >= 2)
 #define	CLKF_PC(framep)		((framep)->cf_eip)
 
+/*
+ * astpending bits
+ */
+#define	AST_PENDING	0x00000001
+#define	AST_RESCHED	0x00000002
+
 /*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 431775f2db25..ca701fbf51f4 100644
--- a/sys/i386/include/ipl.h
+++ b/sys/i386/include/ipl.h
@@ -44,10 +44,4 @@
 
 #define	NSWI		7
 
-/*
- * astpending bits
- */
-#define	AST_PENDING	0x00000001
-#define	AST_RESCHED	0x00000002
-
 #endif /* !_MACHINE_IPL_H_ */