lkml.org 
[lkml]   [2010]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] x86: rename verify_cpu_64.S to verify_cpu.S
    Date
    The code is 32bit already, and can be used in 32bit routines.

    Signed-off-by: Kees Cook <kees.cook@canonical.com>
    Acked-by: Pekka Enberg <penberg@kernel.org>
    Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    ---
    arch/x86/boot/compressed/head_64.S | 2 +-
    arch/x86/kernel/trampoline_64.S | 2 +-
    arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} | 0
    3 files changed, 2 insertions(+), 2 deletions(-)
    rename arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} (100%)

    diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
    index 52f85a1..35af09d 100644
    --- a/arch/x86/boot/compressed/head_64.S
    +++ b/arch/x86/boot/compressed/head_64.S
    @@ -182,7 +182,7 @@ no_longmode:
    hlt
    jmp 1b

    -#include "../../kernel/verify_cpu_64.S"
    +#include "../../kernel/verify_cpu.S"

    /*
    * Be careful here startup_64 needs to be at a predictable
    diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
    index 3af2dff..075d130 100644
    --- a/arch/x86/kernel/trampoline_64.S
    +++ b/arch/x86/kernel/trampoline_64.S
    @@ -127,7 +127,7 @@ startup_64:
    no_longmode:
    hlt
    jmp no_longmode
    -#include "verify_cpu_64.S"
    +#include "verify_cpu.S"

    # Careful these need to be in the same 64K segment as the above;
    tidt:
    diff --git a/arch/x86/kernel/verify_cpu_64.S b/arch/x86/kernel/verify_cpu.S
    similarity index 100%
    rename from arch/x86/kernel/verify_cpu_64.S
    rename to arch/x86/kernel/verify_cpu.S
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-11-10 19:41    [W:0.023 / U:33.432 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site