From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752891AbZFTDXL (ORCPT ); Fri, 19 Jun 2009 23:23:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753815AbZFTDUl (ORCPT ); Fri, 19 Jun 2009 23:20:41 -0400 Received: from mga14.intel.com ([143.182.124.37]:7542 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753425AbZFTDUF (ORCPT ); Fri, 19 Jun 2009 23:20:05 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,257,1243839600"; d="scan'208";a="156644176" Message-Id: <20090620031625.586031116@intel.com> References: <20090620031608.624240019@intel.com> User-Agent: quilt/0.46-1 Date: Sat, 20 Jun 2009 11:16:15 +0800 From: Wu Fengguang To: Andrew Morton Cc: LKML , Nick Piggin , Wu Fengguang cc: Ingo Molnar Cc: Minchan Kim cc: Mel Gorman cc: Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , Hugh Dickins , Andi Kleen , "riel@redhat.com" , "chris.mason@oracle.com" , "linux-mm@kvack.org" Subject: [PATCH 07/15] HWPOISON: define VM_FAULT_HWPOISON to 0 when feature is disabled Content-Disposition: inline; filename=hwpoison-remove-ifdef.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wu Fengguang So as to eliminate one #ifdef in the C source. Proposed by Nick Piggin. Acked-by: Nick Piggin Signed-off-by: Wu Fengguang --- 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) /* --