aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/boot/compressed/head.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/boot/compressed/head.S')
-rw-r--r--arch/i386/boot/compressed/head.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/boot/compressed/head.S b/arch/i386/boot/compressed/head.S
index b5893e4ecd37..40a8de8270a9 100644
--- a/arch/i386/boot/compressed/head.S
+++ b/arch/i386/boot/compressed/head.S
@@ -25,7 +25,6 @@
25 25
26#include <linux/linkage.h> 26#include <linux/linkage.h>
27#include <asm/segment.h> 27#include <asm/segment.h>
28#include <asm/page.h>
29 28
30 .globl startup_32 29 .globl startup_32
31 30
@@ -75,7 +74,7 @@ startup_32:
75 popl %esi # discard address 74 popl %esi # discard address
76 popl %esi # real mode pointer 75 popl %esi # real mode pointer
77 xorl %ebx,%ebx 76 xorl %ebx,%ebx
78 ljmp $(__BOOT_CS), $__PHYSICAL_START 77 ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START
79 78
80/* 79/*
81 * We come here, if we were loaded high. 80 * We come here, if we were loaded high.
@@ -100,7 +99,7 @@ startup_32:
100 popl %ecx # lcount 99 popl %ecx # lcount
101 popl %edx # high_buffer_start 100 popl %edx # high_buffer_start
102 popl %eax # hcount 101 popl %eax # hcount
103 movl $__PHYSICAL_START,%edi 102 movl $CONFIG_PHYSICAL_START,%edi
104 cli # make sure we don't get interrupted 103 cli # make sure we don't get interrupted
105 ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine 104 ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
106 105
@@ -125,5 +124,5 @@ move_routine_start:
125 movsl 124 movsl
126 movl %ebx,%esi # Restore setup pointer 125 movl %ebx,%esi # Restore setup pointer
127 xorl %ebx,%ebx 126 xorl %ebx,%ebx
128 ljmp $(__BOOT_CS), $__PHYSICAL_START 127 ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START
129move_routine_end: 128move_routine_end: