lkml.org 
[lkml]   [2008]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] traps: x86: remove trace_hardirqs_fixup from pagefault handler
    Date
    The last use of trace_hardirqs_fixup is unnecessary, because the
    trap is taken with interrupt off on i386 as well as x86_64, and
    the irq-tracer is notified of this from the assembly code.

    trace_hardirqs_fixup and trace_hardirqs_fixup_flags are removed
    from include/asm-x86/irqflags.h as they are no longer used.

    Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
    ---
    arch/x86/mm/fault.c | 5 -----
    include/asm-x86/irqflags.h | 21 ---------------------
    2 files changed, 0 insertions(+), 26 deletions(-)

    diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
    index 455f3fe..c5bafc9 100644
    --- a/arch/x86/mm/fault.c
    +++ b/arch/x86/mm/fault.c
    @@ -593,11 +593,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
    unsigned long flags;
    #endif

    - /*
    - * We can fault from pretty much anywhere, with unknown IRQ state.
    - */
    - trace_hardirqs_fixup();
    -
    tsk = current;
    mm = tsk->mm;
    prefetchw(&mm->mmap_sem);
    diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h
    index 424acb4..2bdab21 100644
    --- a/include/asm-x86/irqflags.h
    +++ b/include/asm-x86/irqflags.h
    @@ -166,27 +166,6 @@ static inline int raw_irqs_disabled(void)
    return raw_irqs_disabled_flags(flags);
    }

    -/*
    - * makes the traced hardirq state match with the machine state
    - *
    - * should be a rarely used function, only in places where its
    - * otherwise impossible to know the irq state, like in traps.
    - */
    -static inline void trace_hardirqs_fixup_flags(unsigned long flags)
    -{
    - if (raw_irqs_disabled_flags(flags))
    - trace_hardirqs_off();
    - else
    - trace_hardirqs_on();
    -}
    -
    -static inline void trace_hardirqs_fixup(void)
    -{
    - unsigned long flags = __raw_local_save_flags();
    -
    - trace_hardirqs_fixup_flags(flags);
    -}
    -
    #else

    #ifdef CONFIG_X86_64
    --
    1.5.4.3


    \
     
     \ /
      Last update: 2008-09-26 14:45    [W:0.022 / U:0.720 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site