summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/amd64/cpu_switch.S43
-rw-r--r--sys/amd64/amd64/swtch.s43
-rw-r--r--sys/conf/NOTES3
-rw-r--r--sys/i386/conf/LINT3
-rw-r--r--sys/i386/conf/NOTES3
-rw-r--r--sys/i386/i386/swtch.s43
-rw-r--r--sys/i386/isa/icu.s9
7 files changed, 10 insertions, 137 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 02854b9..33bbe28 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,12 +33,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: swtch.s,v 1.28 1996/02/02 18:30:06 davidg Exp $
+ * $Id: swtch.s,v 1.29 1996/02/04 21:20:36 davidg Exp $
*/
#include "npx.h" /* for NNPX */
#include "opt_user_ldt.h" /* for USER_LDT */
#include "assym.s" /* for preprocessor defines */
+#include "apm.h" /* for NAPM */
#include <sys/errno.h> /* for error codes */
#include <machine/asmacros.h> /* for miscellaneous assembly macros */
@@ -248,26 +249,6 @@ _idle:
ALIGN_TEXT
idle_loop:
-#if NAPM > 0
-#if APM_SLOWSTART <=0 || !defined(APM_SLOWSTART)
- movl _apm_slowstart, %eax
- orl %eax, %eax
- jz 1f
- xorl %eax, %eax
- incl %eax
- movl %eax, _apm_slowstart_stat
- movl _apm_ss_cnt, %eax
- cmpl $ APM_SLOWSTART, %eax
- jae 2f
- incl %eax
- movl %eax, _apm_ss_cnt
- call _apm_cpu_idle
- jmp 1f
-2:
- call _apm_cpu_busy
-1:
-#endif
-#endif
cli
movb $1,_intr_nesting_level /* charge Intr if we leave */
cmpl $0,_whichrtqs /* real-time queue */
@@ -281,29 +262,9 @@ idle_loop:
testl %eax, %eax
jnz idle_loop
#if NAPM > 0
-#if APM_SLOWSTART <= 0 || !defined(APM_SLOWSTART)
- /*
- * XXX it breaks the rules to call a function while interrupts are
- * disabled. How long before apm enables them?
- */
call _apm_cpu_idle
call _apm_cpu_busy
#else
- movl _apm_slowstart, %eax
- orl %eax, %eax
- jz 1f
- xorl %eax, %eax
- movl %eax, _apm_ss_cnt
- movl %eax, _apm_slowstart_stat
-1:
- call _apm_cpu_idle
- call _apm_cpu_busy
-#endif
-
-
- call _apm_cpu_idle
- call _apm_cpu_busy
-#else
sti
hlt /* wait for interrupt */
#endif
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 02854b9..33bbe28 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,12 +33,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: swtch.s,v 1.28 1996/02/02 18:30:06 davidg Exp $
+ * $Id: swtch.s,v 1.29 1996/02/04 21:20:36 davidg Exp $
*/
#include "npx.h" /* for NNPX */
#include "opt_user_ldt.h" /* for USER_LDT */
#include "assym.s" /* for preprocessor defines */
+#include "apm.h" /* for NAPM */
#include <sys/errno.h> /* for error codes */
#include <machine/asmacros.h> /* for miscellaneous assembly macros */
@@ -248,26 +249,6 @@ _idle:
ALIGN_TEXT
idle_loop:
-#if NAPM > 0
-#if APM_SLOWSTART <=0 || !defined(APM_SLOWSTART)
- movl _apm_slowstart, %eax
- orl %eax, %eax
- jz 1f
- xorl %eax, %eax
- incl %eax
- movl %eax, _apm_slowstart_stat
- movl _apm_ss_cnt, %eax
- cmpl $ APM_SLOWSTART, %eax
- jae 2f
- incl %eax
- movl %eax, _apm_ss_cnt
- call _apm_cpu_idle
- jmp 1f
-2:
- call _apm_cpu_busy
-1:
-#endif
-#endif
cli
movb $1,_intr_nesting_level /* charge Intr if we leave */
cmpl $0,_whichrtqs /* real-time queue */
@@ -281,29 +262,9 @@ idle_loop:
testl %eax, %eax
jnz idle_loop
#if NAPM > 0
-#if APM_SLOWSTART <= 0 || !defined(APM_SLOWSTART)
- /*
- * XXX it breaks the rules to call a function while interrupts are
- * disabled. How long before apm enables them?
- */
call _apm_cpu_idle
call _apm_cpu_busy
#else
- movl _apm_slowstart, %eax
- orl %eax, %eax
- jz 1f
- xorl %eax, %eax
- movl %eax, _apm_ss_cnt
- movl %eax, _apm_slowstart_stat
-1:
- call _apm_cpu_idle
- call _apm_cpu_busy
-#endif
-
-
- call _apm_cpu_idle
- call _apm_cpu_busy
-#else
sti
hlt /* wait for interrupt */
#endif
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7f89211..776b4d7 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.242 1996/03/02 19:37:32 peter Exp $
+# $Id: LINT,v 1.243 1996/03/11 18:47:39 jkh Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -850,7 +850,6 @@ options POWERFAIL_NMI # make it beep instead of panicing
# More undocumented options for linting.
-options APM_SLOWSTART=1
options DEBUG
options "EXT2FS"
options "IBCS2"
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 7f89211..776b4d7 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.242 1996/03/02 19:37:32 peter Exp $
+# $Id: LINT,v 1.243 1996/03/11 18:47:39 jkh Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -850,7 +850,6 @@ options POWERFAIL_NMI # make it beep instead of panicing
# More undocumented options for linting.
-options APM_SLOWSTART=1
options DEBUG
options "EXT2FS"
options "IBCS2"
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7f89211..776b4d7 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.242 1996/03/02 19:37:32 peter Exp $
+# $Id: LINT,v 1.243 1996/03/11 18:47:39 jkh Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -850,7 +850,6 @@ options POWERFAIL_NMI # make it beep instead of panicing
# More undocumented options for linting.
-options APM_SLOWSTART=1
options DEBUG
options "EXT2FS"
options "IBCS2"
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 02854b9..33bbe28 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,12 +33,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: swtch.s,v 1.28 1996/02/02 18:30:06 davidg Exp $
+ * $Id: swtch.s,v 1.29 1996/02/04 21:20:36 davidg Exp $
*/
#include "npx.h" /* for NNPX */
#include "opt_user_ldt.h" /* for USER_LDT */
#include "assym.s" /* for preprocessor defines */
+#include "apm.h" /* for NAPM */
#include <sys/errno.h> /* for error codes */
#include <machine/asmacros.h> /* for miscellaneous assembly macros */
@@ -248,26 +249,6 @@ _idle:
ALIGN_TEXT
idle_loop:
-#if NAPM > 0
-#if APM_SLOWSTART <=0 || !defined(APM_SLOWSTART)
- movl _apm_slowstart, %eax
- orl %eax, %eax
- jz 1f
- xorl %eax, %eax
- incl %eax
- movl %eax, _apm_slowstart_stat
- movl _apm_ss_cnt, %eax
- cmpl $ APM_SLOWSTART, %eax
- jae 2f
- incl %eax
- movl %eax, _apm_ss_cnt
- call _apm_cpu_idle
- jmp 1f
-2:
- call _apm_cpu_busy
-1:
-#endif
-#endif
cli
movb $1,_intr_nesting_level /* charge Intr if we leave */
cmpl $0,_whichrtqs /* real-time queue */
@@ -281,29 +262,9 @@ idle_loop:
testl %eax, %eax
jnz idle_loop
#if NAPM > 0
-#if APM_SLOWSTART <= 0 || !defined(APM_SLOWSTART)
- /*
- * XXX it breaks the rules to call a function while interrupts are
- * disabled. How long before apm enables them?
- */
call _apm_cpu_idle
call _apm_cpu_busy
#else
- movl _apm_slowstart, %eax
- orl %eax, %eax
- jz 1f
- xorl %eax, %eax
- movl %eax, _apm_ss_cnt
- movl %eax, _apm_slowstart_stat
-1:
- call _apm_cpu_idle
- call _apm_cpu_busy
-#endif
-
-
- call _apm_cpu_idle
- call _apm_cpu_busy
-#else
sti
hlt /* wait for interrupt */
#endif
diff --git a/sys/i386/isa/icu.s b/sys/i386/isa/icu.s
index c88d52b..f04d72d 100644
--- a/sys/i386/isa/icu.s
+++ b/sys/i386/isa/icu.s
@@ -36,7 +36,7 @@
*
* @(#)icu.s 7.2 (Berkeley) 5/21/91
*
- * $Id: icu.s,v 1.22 1995/04/01 04:56:32 ache Exp $
+ * $Id: icu.s,v 1.23 1995/07/05 14:35:34 bde Exp $
*/
/*
@@ -154,13 +154,6 @@ doreti_unpend:
jae doreti_swi
cli
movl %eax,_cpl
-#if NAPM > 0 && defined(APM_SLOWSTART)
- movl _apm_slowstart_stat, %eax
- orl %eax, %eax
- jz 1:
- call _apm_idle_cpu
-1:
-#endif
MEXITCOUNT
jmp %edx
OpenPOWER on IntegriCloud