Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127AbYFYHD3 (ORCPT ); Wed, 25 Jun 2008 03:03:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751966AbYFYHDV (ORCPT ); Wed, 25 Jun 2008 03:03:21 -0400 Received: from argonath.las.ic.unicamp.br ([143.106.60.116]:47801 "EHLO mail.las.ic.unicamp.br" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbYFYHDU (ORCPT ); Wed, 25 Jun 2008 03:03:20 -0400 Date: Wed, 25 Jun 2008 04:03:19 -0300 From: Gustavo Fernando Padovan To: linux-kernel@vger.kernel.org Cc: akpm@osdl.org Subject: [PATCH] x86: remove unnecessary #ifdef CONFIG_X86_32...#else Message-ID: <20080625070319.GA15059@quasar.las> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 837 Lines: 27 Remove the #ifdef conditional because this comparison is already done in user_mode_vm(). Signed-off-by: Gustavo F. Padovan diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -55,11 +55,7 @@ static inline int notify_page_fault(struct pt_regs *regs) int ret = 0; /* kprobe_running() needs smp_processor_id() */ -#ifdef CONFIG_X86_32 if (!user_mode_vm(regs)) { -#else - if (!user_mode(regs)) { -#endif preempt_disable(); if (kprobe_running() && kprobe_fault_handler(regs, 14)) ret = 1; -- 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/