git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
i386
/
boot
/
compressed
/
head.S
diff --git
a/arch/i386/boot/compressed/head.S
b/arch/i386/boot/compressed/head.S
index
4f41af3
..
c5e80b6
100644
(file)
--- a/
arch/i386/boot/compressed/head.S
+++ b/
arch/i386/boot/compressed/head.S
@@
-74,7
+74,7
@@
startup_32:
popl %esi # discard address
popl %esi # real mode pointer
xorl %ebx,%ebx
popl %esi # discard address
popl %esi # real mode pointer
xorl %ebx,%ebx
- ljmp $(__BOOT_CS), $
KERN_PHYS_OFFSET
+ ljmp $(__BOOT_CS), $
0x100000
/*
* We come here, if we were loaded high.
/*
* We come here, if we were loaded high.
@@
-99,7
+99,7
@@
startup_32:
popl %ecx # lcount
popl %edx # high_buffer_start
popl %eax # hcount
popl %ecx # lcount
popl %edx # high_buffer_start
popl %eax # hcount
- movl $
KERN_PHYS_OFFSET
,%edi
+ movl $
0x100000
,%edi
cli # make sure we don't get interrupted
ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
cli # make sure we don't get interrupted
ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
@@
-124,5
+124,5
@@
move_routine_start:
movsl
movl %ebx,%esi # Restore setup pointer
xorl %ebx,%ebx
movsl
movl %ebx,%esi # Restore setup pointer
xorl %ebx,%ebx
- ljmp $(__BOOT_CS), $
KERN_PHYS_OFFSET
+ ljmp $(__BOOT_CS), $
0x100000
move_routine_end:
move_routine_end: