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: 24283 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C57762096A for ; Fri, 7 Feb 2014 10:12:26 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id ar20sf8136075iec.9 for ; Fri, 07 Feb 2014 02:12:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=FSbO/kjXg+DUVZTSMI02Rl0l1mCxzg+cTaSx6i1sMp0=; b=LBY0kkF2smabiPdetMvnAbebNk4vEfJE8gpPoc5buk+BDM3mpOlcY4HV1Ra9UEgUzt w5s1WMQkgn5D1GUbvn2Ja712ZqicKSiI3UtKXWu6r+fVzE8pklkFE0IYuai/ekf4jGU9 51PKlgNgRFPxJ4/TPOFdEf04+cTJOXe8vqO8LuCjAU6TkAv4rWTnHmCTGyx/I6M50VTl GyqHLL+tRDnMKGr+GB93t2hG5kfbqDLnPxHjF0psoVX/KYq0zPgZ+P5qq0E2aFDDSmzK WmO4heMTDukxSIUWIjriKGHfqlCZrA1aH4yXCDy5jxrsBmWNDes1NwyKN6ey9KtXZVy4 hE7g== X-Gm-Message-State: ALoCoQmlpzrCS46fcfpnYrszv2+8AEBNcYg3L4o6mWeN+hPyca9tdCspTpt1x8DHyOccv9tIgTmc X-Received: by 10.182.251.230 with SMTP id zn6mr5421596obc.14.1391767945933; Fri, 07 Feb 2014 02:12:25 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.47 with SMTP id s44ls1050814qgs.70.gmail; Fri, 07 Feb 2014 02:12:25 -0800 (PST) X-Received: by 10.58.66.137 with SMTP id f9mr9618121vet.11.1391767945863; Fri, 07 Feb 2014 02:12:25 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id be7si1159409vcb.110.2014.02.07.02.12.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Feb 2014 02:12:25 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so2520710vcb.28 for ; Fri, 07 Feb 2014 02:12:25 -0800 (PST) X-Received: by 10.59.6.7 with SMTP id cq7mr9894262ved.14.1391767945793; Fri, 07 Feb 2014 02:12:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp91162vcz; Fri, 7 Feb 2014 02:12:24 -0800 (PST) X-Received: by 10.66.228.37 with SMTP id sf5mr6860101pac.19.1391767944254; Fri, 07 Feb 2014 02:12:24 -0800 (PST) Received: from mail-pb0-f42.google.com (mail-pb0-f42.google.com [209.85.160.42]) by mx.google.com with ESMTPS id m1si4416117pbe.358.2014.02.07.02.12.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Feb 2014 02:12:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.42 is neither permitted nor denied by best guess record for domain of takahiro.akashi@linaro.org) client-ip=209.85.160.42; Received: by mail-pb0-f42.google.com with SMTP id jt11so3084891pbb.1 for ; Fri, 07 Feb 2014 02:12:23 -0800 (PST) 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 Cc: arndb@arndb.de, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, patches@linaro.org, AKASHI Takahiro 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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) {