lkml.org 
[lkml]   [2008]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: asm-x86/processor-flags.h, CONFIG_* leaks
    From
    On Mon, Jul 21, 2008 at 2:46 PM, Olaf Hering <olaf@aepfle.de> wrote:
    >
    > asm-x86/processor-flags.h is an exported header,
    > via 'make headers_install_all'
    >
    > Please move X86_VM_MASK inside __KERNEL__

    Oops, this seems to be my fault. Find the fix below.

    As I stated in the original commit, this was tested with 'make
    headers_check', so I can only guess that it's a merge fall-out.

    Adrian Bunk pointed it out in my original submission, which is
    why it was explicitly tested... But I just tested it again, and
    why doesn't make headers_check catch it?

    Sorry :-/


    Vegard


    From d3795de8f7001aa1a485c52e2f0ce565dd1e23cf Mon Sep 17 00:00:00 2001
    From: Vegard Nossum <vegard.nossum@gmail.com>
    Date: Mon, 21 Jul 2008 14:54:23 +0200
    Subject: [PATCH] x86: don't leak X86_VM_MASK in processor-flags.h

    Apparently,

    commit 6330a30a76c1e62d4b4ec238368957f8febf9113
    Author: Vegard Nossum <vegard.nossum@gmail.com>
    Date: Wed May 28 09:46:19 2008 +0200

    x86: break mutual header inclusion

    introduced some CONFIG names to processor-flags.h, which was exported in

    commit 6093015db2bd9e70cf20cdd23be1a50733baafdd
    Author: Ingo Molnar <mingo@elte.hu>
    Date: Sun Mar 30 11:45:23 2008 +0200

    x86: cleanup replace most vm86 flags with flags from processor-flags.h, fix

    Fix it by wrapping the CONFIG parts in __KERNEL__.

    Reported-by: Olaf Hering <olaf@aepfle.de>
    Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
    ---
    include/asm-x86/processor-flags.h | 2 ++
    1 files changed, 2 insertions(+), 0 deletions(-)

    diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h
    index 092b39b..eff2ecd 100644
    --- a/include/asm-x86/processor-flags.h
    +++ b/include/asm-x86/processor-flags.h
    @@ -88,10 +88,12 @@
    #define CX86_ARR_BASE 0xc4
    #define CX86_RCR_BASE 0xdc

    +#ifdef __KERNEL__
    #ifdef CONFIG_VM86
    #define X86_VM_MASK X86_EFLAGS_VM
    #else
    #define X86_VM_MASK 0 /* No VM86 support */
    #endif
    +#endif

    #endif /* __ASM_I386_PROCESSOR_FLAGS_H */
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-07-21 15:09    [W:0.022 / U:29.452 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site