lkml.org 
[lkml]   [2007]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/24] turn priviled operation into a macro in head_64.S
    Date
    under paravirt, read cr2 cannot be issued directly anymore.
    So wrap it in a macro, defined to the operation itself in case
    paravirt is off, but to something else if we have paravirt
    in the game

    Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Acked-by: Jeremy Fitzhardinge <jeremy@xensource.com>
    ---
    arch/x86/kernel/head_64.S | 9 ++++++++-
    1 files changed, 8 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
    index b6167fe..c31b1c9 100644
    --- a/arch/x86/kernel/head_64.S
    +++ b/arch/x86/kernel/head_64.S
    @@ -19,6 +19,13 @@
    #include <asm/msr.h>
    #include <asm/cache.h>

    +#ifdef CONFIG_PARAVIRT
    +#include <asm/asm-offsets.h>
    +#include <asm/paravirt.h>
    +#else
    +#define GET_CR2_INTO_RCX movq %cr2, %rcx
    +#endif
    +
    /* we are not able to switch in one step to the final KERNEL ADRESS SPACE
    * because we need identity-mapped pages.
    *
    @@ -267,7 +274,7 @@ ENTRY(early_idt_handler)
    xorl %eax,%eax
    movq 8(%rsp),%rsi # get rip
    movq (%rsp),%rdx
    - movq %cr2,%rcx
    + GET_CR2_INTO_RCX
    leaq early_idt_msg(%rip),%rdi
    call early_printk
    cmpl $2,early_recursion_flag(%rip)
    --
    1.4.4.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-09 22:37    [W:0.031 / U:2.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site