lkml.org 
[lkml]   [2009]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subjectuml got broken by commit 30742d5c2277c325fb0e9d2d817d55a19995fe8f
    From
    Date

    ... if you revert a commit, revert the fixups elsewhere that had been
    triggered by it. Such as 8c56250f48347750c82ab18d98d647dcf99ca674
    (lockdep, UML: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set).

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    ---
    arch/um/include/asm/system.h | 14 +++++++-------
    1 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/um/include/asm/system.h b/arch/um/include/asm/system.h
    index ae5f94d..753346e 100644
    --- a/arch/um/include/asm/system.h
    +++ b/arch/um/include/asm/system.h
    @@ -11,21 +11,21 @@ extern int get_signals(void);
    extern void block_signals(void);
    extern void unblock_signals(void);

    -#define raw_local_save_flags(flags) do { typecheck(unsigned long, flags); \
    +#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
    (flags) = get_signals(); } while(0)
    -#define raw_local_irq_restore(flags) do { typecheck(unsigned long, flags); \
    +#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
    set_signals(flags); } while(0)

    -#define raw_local_irq_save(flags) do { raw_local_save_flags(flags); \
    - raw_local_irq_disable(); } while(0)
    +#define local_irq_save(flags) do { local_save_flags(flags); \
    + local_irq_disable(); } while(0)

    -#define raw_local_irq_enable() unblock_signals()
    -#define raw_local_irq_disable() block_signals()
    +#define local_irq_enable() unblock_signals()
    +#define local_irq_disable() block_signals()

    #define irqs_disabled() \
    ({ \
    unsigned long flags; \
    - raw_local_save_flags(flags); \
    + local_save_flags(flags); \
    (flags == 0); \
    })

    --
    1.5.6.5



    \
     
     \ /
      Last update: 2009-01-05 18:21    [W:0.021 / U:93.364 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site