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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
x86_64
/
boot
/
compressed
/
head.S
diff --git
a/arch/x86_64/boot/compressed/head.S
b/arch/x86_64/boot/compressed/head.S
index
27264db
..
6f55565
100644
(file)
--- a/
arch/x86_64/boot/compressed/head.S
+++ b/
arch/x86_64/boot/compressed/head.S
@@
-2,8
+2,6
@@
* linux/boot/head.S
*
* Copyright (C) 1991, 1992, 1993 Linus Torvalds
* linux/boot/head.S
*
* Copyright (C) 1991, 1992, 1993 Linus Torvalds
- *
- * $Id: head.S,v 1.3 2001/04/20 00:59:28 ak Exp $
*/
/*
*/
/*
@@
-21,13
+19,14
@@
*/
/*
*/
/*
- * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
+ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
*/
.code32
.text
#include <linux/linkage.h>
#include <asm/segment.h>
*/
.code32
.text
#include <linux/linkage.h>
#include <asm/segment.h>
+#include <asm/page.h>
.code32
.globl startup_32
.code32
.globl startup_32
@@
-77,7
+76,7
@@
startup_32:
jnz 3f
addl $8,%esp
xorl %ebx,%ebx
jnz 3f
addl $8,%esp
xorl %ebx,%ebx
- ljmp $(__KERNEL_CS), $
0x100000
+ ljmp $(__KERNEL_CS), $
__PHYSICAL_START
/*
* We come here, if we were loaded high.
/*
* We come here, if we were loaded high.
@@
-103,7
+102,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 $
0x100000
,%edi
+ movl $
__PHYSICAL_START
,%edi
cli # make sure we don't get interrupted
ljmp $(__KERNEL_CS), $0x1000 # and jump to the move routine
cli # make sure we don't get interrupted
ljmp $(__KERNEL_CS), $0x1000 # and jump to the move routine
@@
-128,7
+127,7
@@
move_routine_start:
movsl
movl %ebx,%esi # Restore setup pointer
xorl %ebx,%ebx
movsl
movl %ebx,%esi # Restore setup pointer
xorl %ebx,%ebx
- ljmp $(__KERNEL_CS), $
0x100000
+ ljmp $(__KERNEL_CS), $
__PHYSICAL_START
move_routine_end:
move_routine_end: