From patchwork Fri Feb 7 10:11:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 3601071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C56199F2D6 for ; Fri, 7 Feb 2014 11:19:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0653920131 for ; Fri, 7 Feb 2014 11:19:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17BC72012B for ; Fri, 7 Feb 2014 11:19:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBiR2-0002l4-J3; Fri, 07 Feb 2014 10:13:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBiQU-0002WK-0G; Fri, 07 Feb 2014 10:12:50 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBiQP-0002Sl-Fi for linux-arm-kernel@lists.infradead.org; Fri, 07 Feb 2014 10:12:47 +0000 Received: by mail-pd0-f179.google.com with SMTP id fp1so2578510pdb.38 for ; Fri, 07 Feb 2014 02:12:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FSbO/kjXg+DUVZTSMI02Rl0l1mCxzg+cTaSx6i1sMp0=; b=koZ8QbFOGYGmCcprs+K9hoXFt6wpXjEXtOI8fFDVfCW6t3oa1PkCJ3n0AsPiY+ikcy 7+18kaKZC8qIvHo/9ue0ppn6v+W86FjzSzyWysIaFOZmVsx8I6SAxFoBbs6UCbCZCLGf rCv29GZKVJPOI98LKPJpnldFQ5uCSEvmd2ceoCZ2agjT/lNp3TbOlVS8ANn+Q+4SNuvs fjBWOHIwmec/a9fpJT2uIof8kxxxauERzPUxjQ1HsoruQn3yxgG8w16yHadBpcWNYmtP 97aQ+RqeYXHPlLxb6XZyjoHEUD8jHmHBK6+tbkgyJz4qu40OLZ64k00qIrELm4N46y/X T/EA== X-Gm-Message-State: ALoCoQm2gNl8y4ndr7eDRdQXpwU04ABtoNPMs+3350FdWL05NJRUzt75cTv9BNTpWnhns6whAf6x X-Received: by 10.66.51.137 with SMTP id k9mr6928566pao.11.1391767943867; Fri, 07 Feb 2014 02:12:23 -0800 (PST) Received: from localhost.localdomain (KD182249085115.au-net.ne.jp. [182.249.85.115]) by mx.google.com with ESMTPSA id xn12sm29491658pac.12.2014.02.07.02.12.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Feb 2014 02:12:22 -0800 (PST) From: AKASHI Takahiro To: wad@chromium.org, catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH 2/2] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h Date: Fri, 7 Feb 2014 19:11:32 +0900 Message-Id: <1391767892-5395-3-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391767892-5395-1-git-send-email-takahiro.akashi@linaro.org> References: <1391767892-5395-1-git-send-email-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140207_051245_684611_32F5D046 X-CRM114-Status: GOOD ( 10.76 ) X-Spam-Score: -1.9 (-) Cc: linaro-kernel@lists.linaro.org, patches@linaro.org, arndb@arndb.de, linux-kernel@vger.kernel.org, AKASHI Takahiro , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kernel/seccomp.c includes linux/compat.h and, indicrectly, asm/compat.h via asm/syscall.h. Due to the duplicated definition of is_compat_task, compiling this file will fail in the case of !CONFIG_COMPAT. This patch makes the definition in asm/compat.h valid only if necessary. Signed-off-by: AKASHI Takahiro --- arch/arm64/include/asm/compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index fda2704..72f3b18 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -305,10 +305,12 @@ static inline int is_compat_thread(struct thread_info *thread) #else /* !CONFIG_COMPAT */ +#ifndef is_compat_task /* it's there in linux/compat.h */ static inline int is_compat_task(void) { return 0; } +#endif static inline int is_compat_thread(struct thread_info *thread) {