From d77166b6c566af3f7b80f52c6577543eafa1b62a Mon Sep 17 00:00:00 2001 From: "gorcunov@gmail.com" Date: Sun, 23 Mar 2008 00:00:07 +0300 Subject: [PATCH] --- yaml --- r: 89059 b: refs/heads/master c: a7bba17bf09e1c5bdbdd6c0ab0c7833baedf4653 h: refs/heads/master i: 89057: 8c6e7b282675e071ccebb8191d0d819b5382640c 89055: 3dc06a14a120800ca38e4027f11c24421d2434dc v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/relocate_kernel_32.S | 2 +- trunk/arch/x86/kernel/relocate_kernel_64.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63522373b644..7b90bb6bf740 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4039ae538030d1c5fc70a9c4e168a758d35b8159 +refs/heads/master: a7bba17bf09e1c5bdbdd6c0ab0c7833baedf4653 diff --git a/trunk/arch/x86/kernel/relocate_kernel_32.S b/trunk/arch/x86/kernel/relocate_kernel_32.S index fbc4fad23137..ce12bb8678ad 100644 --- a/trunk/arch/x86/kernel/relocate_kernel_32.S +++ b/trunk/arch/x86/kernel/relocate_kernel_32.S @@ -154,7 +154,7 @@ relocate_new_kernel: movl %eax, %cr3 /* setup a new stack at the end of the physical control page */ - lea 4096(%edi), %esp + lea PAGE_SIZE(%edi), %esp /* jump to identity mapped page */ movl %edi, %eax diff --git a/trunk/arch/x86/kernel/relocate_kernel_64.S b/trunk/arch/x86/kernel/relocate_kernel_64.S index e252c0ed9539..c2c8b9d6e241 100644 --- a/trunk/arch/x86/kernel/relocate_kernel_64.S +++ b/trunk/arch/x86/kernel/relocate_kernel_64.S @@ -159,7 +159,7 @@ relocate_new_kernel: movq %r9, %cr3 /* setup a new stack at the end of the physical control page */ - lea 4096(%r8), %rsp + lea PAGE_SIZE(%r8), %rsp /* jump to identity mapped page */ addq $(identity_mapped - relocate_kernel), %r8