From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753484AbaCXQVZ (ORCPT ); Mon, 24 Mar 2014 12:21:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26189 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753027AbaCXQVX (ORCPT ); Mon, 24 Mar 2014 12:21:23 -0400 Message-ID: <1395678071.24733.3.camel@flatline.rdu.redhat.com> Subject: Re: [PATCH] compat_audit: allow it to work without asm/unistd32.h From: Eric Paris To: Chris Metcalf Cc: linux-kernel@vger.kernel.org, AKASHI Takahiro Date: Mon, 24 Mar 2014 12:21:11 -0400 In-Reply-To: <201403201730.s2KHUVpf005157@farm-0039.internal.tilera.com> References: <201403201730.s2KHUVpf005157@farm-0039.internal.tilera.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I don't know tilegx, but I have replaced 223b24d807610 with 4b58841149dcaa5. I believe adding AUDIT_ARCH_COMPAT_GENERIC was akashi-san's fix for this problem on mips. Is this a better fix? Thanks -Eric On Thu, 2014-03-20 at 11:31 -0400, Chris Metcalf wrote: > For architectures that use the asm-generic syscall table for both > 32- and 64-bit, there should be no need to provide a separate > ; just using is sufficient. > Conditionalize use of on the one platform that > currently requires it (arm64). If another platform ends up needing > it we can create a suitable config flag at that point. > > This change fixes the tilegx build failure seen in linux-next. > > Signed-off-by: Chris Metcalf > --- > By the way - I also note that commit 223b24d807610 that introduced > this also put an "#ifdef COMPAT_xxx" in a UAPI header. This seems > like a pretty clear signal that the added code should be in > linux/include/audit.h, not linux/uapi/include/audit.h. But here > I'm just focussing on getting tilegx to continue to build... > > lib/compat_audit.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/lib/compat_audit.c b/lib/compat_audit.c > index 873f75b640ab..e89a84b3fbe8 100644 > --- a/lib/compat_audit.c > +++ b/lib/compat_audit.c > @@ -1,6 +1,11 @@ > #include > #include > -#include > +#ifdef COMPAT_ARM64 > +/* 64-bit syscalls are generic, but 32-bit are not. */ > +# include > +#else > +# include > +#endif > > unsigned compat_dir_class[] = { > #include