lkml.org 
[lkml]   [2009]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 07/22] HWPOISON: define VM_FAULT_HWPOISON to 0 when feature is disabled
    From: Wu Fengguang <fengguang.wu@intel.com>

    So as to eliminate one #ifdef in the c source.

    Proposed by Nick Piggin.

    Acked-by: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    ---
    arch/x86/mm/fault.c | 3 +--
    include/linux/mm.h | 7 ++++++-
    2 files changed, 7 insertions(+), 3 deletions(-)

    --- sound-2.6.orig/arch/x86/mm/fault.c
    +++ sound-2.6/arch/x86/mm/fault.c
    @@ -820,14 +820,13 @@ do_sigbus(struct pt_regs *regs, unsigned
    tsk->thread.error_code = error_code;
    tsk->thread.trap_no = 14;

    -#ifdef CONFIG_MEMORY_FAILURE
    if (fault & VM_FAULT_HWPOISON) {
    printk(KERN_ERR
    "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
    tsk->comm, tsk->pid, address);
    code = BUS_MCEERR_AR;
    }
    -#endif
    +
    force_sig_info_fault(SIGBUS, code, address, tsk);
    }

    --- sound-2.6.orig/include/linux/mm.h
    +++ sound-2.6/include/linux/mm.h
    @@ -700,11 +700,16 @@ static inline int page_mapped(struct pag
    #define VM_FAULT_SIGBUS 0x0002
    #define VM_FAULT_MAJOR 0x0004
    #define VM_FAULT_WRITE 0x0008 /* Special case for get_user_pages */
    -#define VM_FAULT_HWPOISON 0x0010 /* Hit poisoned page */

    #define VM_FAULT_NOPAGE 0x0100 /* ->fault installed the pte, not return page */
    #define VM_FAULT_LOCKED 0x0200 /* ->fault locked the returned page */

    +#ifdef CONFIG_MEMORY_FAILURE
    +#define VM_FAULT_HWPOISON 0x0010 /* Hit poisoned page */
    +#else
    +#define VM_FAULT_HWPOISON 0
    +#endif
    +
    #define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | VM_FAULT_HWPOISON)

    /*
    --



    \
     
     \ /
      Last update: 2009-06-15 05:19    [W:0.024 / U:30.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site