From 24443697cd389bf74d3de73c332aa6f89944ea95 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 14 May 2013 14:48:58 +0800 Subject: [PATCH] --- yaml --- r: 376444 b: refs/heads/master c: e9d0626ed43a41a3fc526d1df06122b0d4eac174 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head_64.S | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 167fcdf41b05..18bd979f21e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3979fdce77e6c2de97fa6c6f844ee76f001f4371 +refs/heads/master: e9d0626ed43a41a3fc526d1df06122b0d4eac174 diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S index 08f7e8039099..321d65ebaffe 100644 --- a/trunk/arch/x86/kernel/head_64.S +++ b/trunk/arch/x86/kernel/head_64.S @@ -115,8 +115,10 @@ startup_64: movq %rdi, %rax shrq $PUD_SHIFT, %rax andl $(PTRS_PER_PUD-1), %eax - movq %rdx, (4096+0)(%rbx,%rax,8) - movq %rdx, (4096+8)(%rbx,%rax,8) + movq %rdx, 4096(%rbx,%rax,8) + incl %eax + andl $(PTRS_PER_PUD-1), %eax + movq %rdx, 4096(%rbx,%rax,8) addq $8192, %rbx movq %rdi, %rax