From patchwork Tue Feb 25 09:20:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 25253 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C1C0820558 for ; Tue, 25 Feb 2014 09:21:40 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf4410605pdj.0 for ; Tue, 25 Feb 2014 01:21:40 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=7sxuHZas8JhuUBJGfrbY9lKYZ7ZEl0azPU3c5xuxXeI=; b=jzDOATmFcUROSnkydMb7e+H7YSCKbmgoit0oZkh79hsTHe4MuuogQQ0rUIu6O29/Mk SKZesgeEAf8OQ+pqxxg/0sG4hCU0oFAZriI83e+poyyDZLF2NrQyeaxwA1moH2RysFuT eN9X5mowUdfNaoNr0NJWldn60lthfF+5xutV6XaLT3jWuicQEKg3SiCPNStfk2Ku9Jtp wqd97jSkQLh773K9Ppc7+kJ56s8Ec6HgRquEpYC9il3hjmKJiG5QuBPJnzU1/MYCNkX7 SVhdaPREcool1CKGvh8Aw2DN/ysLlTGp3rBL6AIK7KzuUyFLb+gEXuUQ8/36XjM6qat4 oUoQ== X-Gm-Message-State: ALoCoQmJG3rfE5j3QCQmGkUflppTKbK3dIjPe0DU8rQroDTc7CVXYmU4ep0cX1qU86M4gOWf4QxM X-Received: by 10.66.246.194 with SMTP id xy2mr146783pac.36.1393320099992; Tue, 25 Feb 2014 01:21:39 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.241 with SMTP id t104ls1569657qgt.21.gmail; Tue, 25 Feb 2014 01:21:39 -0800 (PST) X-Received: by 10.220.2.199 with SMTP id 7mr211755vck.4.1393320098807; Tue, 25 Feb 2014 01:21:38 -0800 (PST) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id tr5si6651624vdc.26.2014.02.25.01.21.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 01:21:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id pa12so110765veb.35 for ; Tue, 25 Feb 2014 01:21:38 -0800 (PST) X-Received: by 10.52.68.106 with SMTP id v10mr44909vdt.59.1393320098705; Tue, 25 Feb 2014 01:21:38 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp123783vcz; Tue, 25 Feb 2014 01:21:38 -0800 (PST) X-Received: by 10.68.189.198 with SMTP id gk6mr5385768pbc.146.1393320095113; Tue, 25 Feb 2014 01:21:35 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zo6si2976180pbc.103.2014.02.25.01.21.34; Tue, 25 Feb 2014 01:21:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753094AbaBYJVQ (ORCPT + 26 others); Tue, 25 Feb 2014 04:21:16 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:51700 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753062AbaBYJVI (ORCPT ); Tue, 25 Feb 2014 04:21:08 -0500 Received: by mail-pd0-f176.google.com with SMTP id r10so432929pdi.7 for ; Tue, 25 Feb 2014 01:21:08 -0800 (PST) X-Received: by 10.66.161.38 with SMTP id xp6mr352108pab.145.1393320068340; Tue, 25 Feb 2014 01:21:08 -0800 (PST) Received: from localhost.localdomain (KD182249093189.au-net.ne.jp. [182.249.93.189]) by mx.google.com with ESMTPSA id eb5sm138975943pad.22.2014.02.25.01.21.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 01:21:07 -0800 (PST) From: AKASHI Takahiro To: wad@chromium.org, catalin.marinas@arm.com, will.deacon@arm.com Cc: dsaxena@linaro.org, arndb@arndb.de, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v2 3/3] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h Date: Tue, 25 Feb 2014 18:20:25 +0900 Message-Id: <1393320025-2855-4-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393320025-2855-1-git-send-email-takahiro.akashi@linaro.org> References: <1391767892-5395-1-git-send-email-takahiro.akashi@linaro.org> <1393320025-2855-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.128.176 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org 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 definitions of is_compat_task, compiling this file will fail in the case of !CONFIG_COMPAT. So this patch 1) removes is_compat_task() definition from asm/compat.h 2) replaces asm/compat.h to linux/compat.h in kernel/*.c Signed-off-by: AKASHI Takahiro --- arch/arm64/include/asm/compat.h | 5 ----- arch/arm64/kernel/hw_breakpoint.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/arm64/kernel/ptrace.c | 2 +- arch/arm64/kernel/signal.c | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index fda2704..3b334f9 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -305,11 +305,6 @@ static inline int is_compat_thread(struct thread_info *thread) #else /* !CONFIG_COMPAT */ -static inline int is_compat_task(void) -{ - return 0; -} - static inline int is_compat_thread(struct thread_info *thread) { return 0; diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index f17f581..a45e2db 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -20,6 +20,7 @@ #define pr_fmt(fmt) "hw-breakpoint: " fmt +#include #include #include #include @@ -27,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 248a15d..c3805b6 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -20,6 +20,7 @@ #include +#include #include #include #include @@ -44,7 +45,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index f2a74bc..340d51f 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -20,6 +20,7 @@ */ #include +#include #include #include #include @@ -38,7 +39,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 890a591..4a09989 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -25,7 +26,6 @@ #include #include -#include #include #include #include