From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368Ab3FXKPH (ORCPT ); Mon, 24 Jun 2013 06:15:07 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:33749 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751592Ab3FXKPE (ORCPT ); Mon, 24 Jun 2013 06:15:04 -0400 Date: Mon, 24 Jun 2013 11:14:29 +0100 From: Will Deacon To: Chen Gang Cc: Catalin Marinas , Tony Lindgren , "olof@lixom.net" , Santosh Shilimkar , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Linux-Arch Subject: Re: [PATCH v2] arch: arm64: kernel: add '#ifdef CONFIG_COMPAT' for aarch32_break_handler() Message-ID: <20130624101429.GF23779@mudshark.cambridge.arm.com> References: <51C53C06.7050205@asianux.com> <51C81115.4070803@asianux.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <51C81115.4070803@asianux.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 24, 2013 at 10:27:49AM +0100, Chen Gang wrote: > > If 'COMPAT' not defined, aarch32_break_handler() cannot pass compiling, > and it can work independent with 'COMPAT', so remove dummy definition. > > The related make: > > make ARCH=arm64 randconfig > make ARCH=arm64 menuconfig > make ARCH=arm64 V=1 EXTRA_CFLAGS=-W This sequence isn't really very useful, so I wouldn't bother including it in the commit message. You can trigger this issue just by disabling CONFIG_COMPAT. > The related error: > > arch/arm64/kernel/debug-monitors.c:249:5: error: redefinition of ‘aarch32_break_handler’ > In file included from arch/arm64/kernel/debug-monitors.c:29:0: > /root/linux-next/arch/arm64/include/asm/debug-monitors.h:89:12: note: previous definition of ‘aarch32_break_handler’ was here > > > > Signed-off-by: Chen Gang > --- > arch/arm64/include/asm/debug-monitors.h | 7 ------- > 1 files changed, 0 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h > index ef8235c..a2232d0 100644 > --- a/arch/arm64/include/asm/debug-monitors.h > +++ b/arch/arm64/include/asm/debug-monitors.h > @@ -83,14 +83,7 @@ static inline int reinstall_suspended_bps(struct pt_regs *regs) > } > #endif > > -#ifdef CONFIG_COMPAT > int aarch32_break_handler(struct pt_regs *regs); > -#else > -static int aarch32_break_handler(struct pt_regs *regs) > -{ > - return -EFAULT; > -} > -#endif Code looks fine to me: Acked-by: Will Deacon Will