From patchwork Thu Mar 13 10:17:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 26195 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28125206A0 for ; Thu, 13 Mar 2014 10:17:43 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id e16sf1792765qcx.6 for ; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) 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=/lrziJvMPFzwoEJ28aevnyBYq/9qBk7YWmN0/ZArEBE=; b=Z9glcRc1ScNi2YIW3jjeN4UWLyBH73+wWsEIaJoqTuHC6OKy4OY7HsxrWfubFWT+mS nYjndFbIBPtIxwytqvvW+k7dC1wFsvVwBzIkZSdfhJJKAV71+qjZV+I17tjUlQONH7zs +8pM/rGkFH5wseFhlXfCCGzAV4LFZtkuC9ugGzoLU4pUOTrDLjTsU7kHNrld/sJDxKxw 6klSP0B/gO3AH7REqEo+UjLzTJhok19lSXndc8OW7wiG3cwpXBnVSAX4JA1fhdB7z51M Iau69OnacnB5vjk4Y7wSMWCLSb39P9g6DK7oylS4kUphZyehjfiJg3wua0oJ3GYpouQR 8zhQ== X-Gm-Message-State: ALoCoQmaOxbbD1TUFTqSyJWJR9kTzs4q1RnqGOrCx9xQ8SGTaN9V6FLMd56lZ10iQTRGHqyzrMZO X-Received: by 10.236.78.70 with SMTP id f46mr351239yhe.19.1394705862908; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.51 with SMTP id o48ls206449qgd.83.gmail; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr601800vdb.30.1394705862763; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id rx10si242044vdc.136.2014.03.13.03.17.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 03:17:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 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.178; Received: by mail-vc0-f178.google.com with SMTP id im17so829617vcb.37 for ; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr722381vec.6.1394705862676; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) 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.78.9 with SMTP id i9csp356046vck; Thu, 13 Mar 2014 03:17:42 -0700 (PDT) X-Received: by 10.68.40.138 with SMTP id x10mr1385971pbk.8.1394705861787; Thu, 13 Mar 2014 03:17:41 -0700 (PDT) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by mx.google.com with ESMTPS id hb1si1057976pac.487.2014.03.13.03.17.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 03:17:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.170 is neither permitted nor denied by best guess record for domain of takahiro.akashi@linaro.org) client-ip=209.85.192.170; Received: by mail-pd0-f170.google.com with SMTP id v10so886886pde.1 for ; Thu, 13 Mar 2014 03:17:41 -0700 (PDT) X-Received: by 10.66.145.230 with SMTP id sx6mr1221955pab.47.1394705861423; Thu, 13 Mar 2014 03:17:41 -0700 (PDT) Received: from localhost.localdomain (KD182249091179.au-net.ne.jp. [182.249.91.179]) by mx.google.com with ESMTPSA id qh2sm7604887pab.13.2014.03.13.03.17.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 03:17:40 -0700 (PDT) From: AKASHI Takahiro To: wad@chromium.org, catalin.marinas@arm.com, will.deacon@arm.com, arndb@arndb.de Cc: dsaxena@linaro.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, patches@linaro.org, AKASHI Takahiro Subject: [PATCH v3 3/3] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h Date: Thu, 13 Mar 2014 19:17:03 +0900 Message-Id: <1394705823-12465-4-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394705823-12465-1-git-send-email-takahiro.akashi@linaro.org> References: <1393320025-2855-1-git-send-email-takahiro.akashi@linaro.org> <1394705823-12465-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.178 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 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 1c0a9be..02eefc6 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 be2bb4c..674bae2 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