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 / kernel / relocate_kernel.S

diff --git a/arch/x86_64/kernel/relocate_kernel.S b/arch/x86_64/kernel/relocate_kernel.S
index c944e59..d24fa9b 100644 (file)
--- a/arch/x86_64/kernel/relocate_kernel.S
+++ b/arch/x86_64/kernel/relocate_kernel.S
@@ -1,6 +1,6 @@
 /*
  * relocate_kernel.S - put the kernel image in place to boot
- * Copyright (C) 2002-2004 Eric Biederman  <ebiederm@xmission.com>
+ * Copyright (C) 2002-2005 Eric Biederman  <ebiederm@xmission.com>
  *
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
@@ -15,7 +15,7 @@
        .globl relocate_new_kernel
        .code64
 relocate_new_kernel:
-       /* %rdi indirection_page
+       /* %rdi page_list
         * %rsi reboot_code_buffer
         * %rdx start address
         * %rcx page_table
@@ -72,30 +72,32 @@ relocate_new_kernel:
        movq    %rcx, %cr3
 
        /* Do the copies */
-       movq    %rdi, %rbx      /* Put the indirection page in %rbx */
+       movq    %rdi, %rcx      /* Put the page_list in %rcx */
        xorq    %rdi, %rdi
        xorq    %rsi, %rsi
+       jmp     1f
 
 0:     /* top, read another word for the indirection page */
 
        movq    (%rbx), %rcx
        addq    $8,     %rbx
+1:
        testq   $0x1,   %rcx  /* is it a destination page? */
-       jz      1f
+       jz      2f
        movq    %rcx,   %rdi
        andq    $0xfffffffffffff000, %rdi
        jmp     0b
-1:
+2:
        testq   $0x2,   %rcx  /* is it an indirection page? */
-       jz      1f
+       jz      2f
        movq    %rcx,   %rbx
        andq    $0xfffffffffffff000, %rbx
        jmp     0b
-1:
+2:
        testq   $0x4,   %rcx  /* is it the done indicator? */
-       jz      1f
-       jmp     2f
-1:
+       jz      2f
+       jmp     3f
+2:
        testq   $0x8,   %rcx  /* is it the source indicator? */
        jz      0b            /* Ignore it otherwise */
        movq    %rcx,   %rsi  /* For ever source page do a copy */
@@ -104,7 +106,7 @@ relocate_new_kernel:
        movq    $512,   %rcx
        rep ; movsq
        jmp     0b
-2:
+3:
 
        /* To be certain of avoiding problems with self-modifying code
         * I need to execute a serializing instruction here.