lkml.org 
[lkml]   [2007]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH x86 for review II] [16/39] x86: simplify notify_page_fault()
    Date

    From: "Jan Beulich" <jbeulich@novell.com>
    Remove all parameters from this function that aren't really variable.

    Signed-off-by: Jan Beulich <jbeulich@novell.com>
    Signed-off-by: Andi Kleen <ak@suse.de>

    ---
    arch/i386/mm/fault.c | 18 ++++++++----------
    arch/x86_64/mm/fault.c | 18 ++++++++----------
    2 files changed, 16 insertions(+), 20 deletions(-)

    Index: linux/arch/i386/mm/fault.c
    ===================================================================
    --- linux.orig/arch/i386/mm/fault.c
    +++ linux/arch/i386/mm/fault.c
    @@ -46,17 +46,17 @@ int unregister_page_fault_notifier(struc
    }
    EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);

    -static inline int notify_page_fault(enum die_val val, const char *str,
    - struct pt_regs *regs, long err, int trap, int sig)
    +static inline int notify_page_fault(struct pt_regs *regs, long err)
    {
    struct die_args args = {
    .regs = regs,
    - .str = str,
    + .str = "page fault",
    .err = err,
    - .trapnr = trap,
    - .signr = sig
    + .trapnr = 14,
    + .signr = SIGSEGV
    };
    - return atomic_notifier_call_chain(&notify_page_fault_chain, val, &args);
    + return atomic_notifier_call_chain(&notify_page_fault_chain,
    + DIE_PAGE_FAULT, &args);
    }

    /*
    @@ -353,8 +353,7 @@ fastcall void __kprobes do_page_fault(st
    if (unlikely(address >= TASK_SIZE)) {
    if (!(error_code & 0x0000000d) && vmalloc_fault(address) >= 0)
    return;
    - if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
    - SIGSEGV) == NOTIFY_STOP)
    + if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
    return;
    /*
    * Don't take the mm semaphore here. If we fixup a prefetch
    @@ -363,8 +362,7 @@ fastcall void __kprobes do_page_fault(st
    goto bad_area_nosemaphore;
    }

    - if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
    - SIGSEGV) == NOTIFY_STOP)
    + if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
    return;

    /* It's safe to allow irq's after cr2 has been saved and the vmalloc
    Index: linux/arch/x86_64/mm/fault.c
    ===================================================================
    --- linux.orig/arch/x86_64/mm/fault.c
    +++ linux/arch/x86_64/mm/fault.c
    @@ -56,17 +56,17 @@ int unregister_page_fault_notifier(struc
    }
    EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);

    -static inline int notify_page_fault(enum die_val val, const char *str,
    - struct pt_regs *regs, long err, int trap, int sig)
    +static inline int notify_page_fault(struct pt_regs *regs, long err)
    {
    struct die_args args = {
    .regs = regs,
    - .str = str,
    + .str = "page fault",
    .err = err,
    - .trapnr = trap,
    - .signr = sig
    + .trapnr = 14,
    + .signr = SIGSEGV
    };
    - return atomic_notifier_call_chain(&notify_page_fault_chain, val, &args);
    + return atomic_notifier_call_chain(&notify_page_fault_chain,
    + DIE_PAGE_FAULT, &args);
    }

    void bust_spinlocks(int yes)
    @@ -376,8 +376,7 @@ asmlinkage void __kprobes do_page_fault(
    if (vmalloc_fault(address) >= 0)
    return;
    }
    - if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
    - SIGSEGV) == NOTIFY_STOP)
    + if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
    return;
    /*
    * Don't take the mm semaphore here. If we fixup a prefetch
    @@ -386,8 +385,7 @@ asmlinkage void __kprobes do_page_fault(
    goto bad_area_nosemaphore;
    }

    - if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
    - SIGSEGV) == NOTIFY_STOP)
    + if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
    return;

    if (likely(regs->eflags & X86_EFLAGS_IF))
    -
    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-02-12 08:45    [W:2.963 / U:0.676 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site