[syslinux:pathbased] core: move __jiffies and _IdleTimer to .data16

syslinux-bot for H. Peter Anvin hpa at linux.intel.com
Tue Mar 30 16:36:09 PDT 2010


Commit-ID:  234f4a30ac426b535946325fa4125425e152e473
Gitweb:     http://syslinux.zytor.com/commit/234f4a30ac426b535946325fa4125425e152e473
Author:     H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Tue, 30 Mar 2010 16:31:47 -0700
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Tue, 30 Mar 2010 16:31:47 -0700

core: move __jiffies and _IdleTimer to .data16

Move the __jiffies and _IdleTimer variables to the .data16 segment.
This ensures that if do_idle is invoked very early that it will not
jump off into a non-existent idle routine.

Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>


---
 core/idle.inc  |    9 ++++-----
 core/timer.inc |    6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/idle.inc b/core/idle.inc
index 0da03ef..9677c82 100644
--- a/core/idle.inc
+++ b/core/idle.inc
@@ -70,13 +70,12 @@ do_idle:
 .ret:		ret
 
 		section .data16
-		alignz 2
+		alignz 4
+		global _IdleTimer
+_IdleTimer	dd 0
 		global NoHalt
 NoHalt		dw 0
 
 hlt_err		db 'ERROR: idle with IF=0', CR, LF, 0 
 
-		section .bss16
-		global _IdleTimer
-		alignb 4
-_IdleTimer	resd 1
+		section .text16
diff --git a/core/timer.inc b/core/timer.inc
index 095e92e..728812b 100644
--- a/core/timer.inc
+++ b/core/timer.inc
@@ -40,7 +40,7 @@ timer_irq:
 		jmp 0:0
 BIOS_timer_next	equ $-4
 
-		section .bss16
-		alignb 4
+		section .data16
+		alignz 4
 		global __jiffies
-__jiffies	resd 1			; The actual timer variable
+__jiffies	dd 0			; The actual timer variable



More information about the Syslinux-commits mailing list