From patchwork Mon Dec 26 10:31:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9488587 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E704C604B9 for ; Mon, 26 Dec 2016 10:34:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD0171FF26 for ; Mon, 26 Dec 2016 10:34:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFB2E20008; Mon, 26 Dec 2016 10:34:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 37A871FF26 for ; Mon, 26 Dec 2016 10:34:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLSYw-0001gk-7X; Mon, 26 Dec 2016 10:31:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLSYt-0001ge-Sq for xen-devel@lists.xenproject.org; Mon, 26 Dec 2016 10:31:24 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id CD/0D-05787-B71F0685; Mon, 26 Dec 2016 10:31:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRWlGSWpSXmKPExsVyIfr4DN2qjwk RBi0v5Sy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxbF/exF9xUqLh9fjdrA+MlmS5GLg4WgVks Es/ubWYCcYQEPjFK/H3zi6WLkZODTUBDomnrZEYQW0RAV+JC2xQWkCJmgS1MEg9uHWEHSQgLe Ev8b3/ECmKzCKhK3H59mw3E5hVwkpj4ZjpYs4SAnMTNc53MELaOxNy9B1ggbDWJRxuWsUPYUR J/d18FinMA2SYST74lQ4SNJV6+WgDVaiXx+/AaqFZDif/7rkCND5M4PucAE4TtJLFrYgdUDZf Eganz2CBsfonDs+9B1fNJ7Fu4gW0Co+gCRoZVjBrFqUVlqUW6RsZ6SUWZ6RkluYmZObqGBmZ6 uanFxYnpqTmJScV6yfm5mxiBAc0ABDsY/8wPPMQoycGkJMqbsCEhQogvKT+lMiOxOCO+qDQnt fgQowwHh5IEr+kHoJxgUWp6akVaZg4wtmDSEhw8SiK8X94DpXmLCxJzizPTIVKnGBWlxHltQP oEQBIZpXlwbbB4vsQoKyXMywh0iBBPQWpRbmYJqvwrRnEORiVh3m8g43ky80rgpr8CWswEtFi /Ph5kcUkiQkqqgVFpblvIqW2MMf/N7rrLyyuuaKw2lTX5ezk6MveukvnBRZYs2/h6N0o1WUZd Tnj4edeP7PKJEcvXFyS1mujnXQ04JFJ4okMp05Hp0qV3ormZ067NkdM7K/tfUFgtj/PGhCsbd 7n9MD8ioqPW9a+y52H6ileNk9l29vgucTp63l3Uej136ZdSESWW4oxEQy3mouJEAHY8cwniAg AA X-Env-Sender: linux@roeck-us.net X-Msg-Ref: server-4.tower-27.messagelabs.com!1482748280!78352551!1 X-Originating-IP: [208.91.199.152] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57865 invoked from network); 26 Dec 2016 10:31:22 -0000 Received: from bh-25.webhostbox.net (HELO bh-25.webhostbox.net) (208.91.199.152) by server-4.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 26 Dec 2016 10:31:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=ZuA3swD0kkkiDgreV4ht6ctrZSd/L+2WqCVvNH/78+U=; b=IFobrx2rji0jPwS34qYrUbaXnt 3XM9FA6TFRFo2XM/FTIvwCmU2jju7d/iMJN0C3Jl51nS9oP/i+k1rL8x8DRQBqvMKFvQK5/JrDMjb W7y75opB+keFrwc6Hdyo0CDGz/l/3zcXpeaCD6ARdx591ReS4IAzdcHx2DgRuuSjFEqRPE7yYN52R gIMGpu/84RCqLMs8Fy498E55PTQ+gKZuUUyl2Nn680+AwiLRWZDOd5wIhxCRD10zXyw+Ul33qPUZ+ 6wTrRXga6Cax0zDkoLKadXXgm9V2/0aH575xHHDPeXwo7Gfblh5qoomsXNjpmZUzp9eEr6W2RiC/8 Bplp4/wQ==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:35214 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1cLSYm-000hBl-V7; Mon, 26 Dec 2016 10:31:19 +0000 From: Guenter Roeck To: Catalin Marinas Date: Mon, 26 Dec 2016 02:31:08 -0800 Message-Id: <1482748268-10399-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - lists.xenproject.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Cc: Stefano Stabellini , Will Deacon , linux-kernel@vger.kernel.org, Guenter Roeck , xen-devel@lists.xenproject.org, Linus Torvalds , linux-arm-kernel@lists.infradead.org, Al Viro Subject: [Xen-devel] [PATCH] arm64: Do not include linux/uaccess.h from assembler files X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Including linux/uaccess.h from assembler files in arm64 builds results in the following build errors. In file included from arm64/include/asm/asm-offsets.h:1:0, from arch/arm64/include/asm/assembler.h:26, from arch/arm64/include/asm/alternative.h:68, from arch/arm64/kernel/entry.S include/linux/sched/prio.h: Assembler messages: include/linux/sched/prio.h:47: Error: unknown mnemonic `static' -- `static inline long nice_to_rlimit(long nice)' build/include/linux/sched/prio.h:48: Error: junk at end of line, first unrecognized character is `{' [and many more] If asm/uaccess.h is not included, many of the affected files fail to build with errors such as the following. arch/arm64/lib/copy_to_user.S: Assembler messages: arch/arm64/lib/copy_to_user.S:66: Error: unknown mnemonic `uaccess_enable_not_uao' -- `uaccess_enable_not_uao x3,x4' arch/arm64/lib/copy_template.S:71: Error: unknown mnemonic `uao_user_alternative' -- `uao_user_alternative 9998f,strb,st trb,tmp1w,dst,#1' Either drop the include if unnecessary or, if needed, replace with asm/uaccess.h. Fixes: 7c0f6ba682b9 ("Replace with globally") Cc: Linus Torvalds Cc: Al Viro Signed-off-by: Guenter Roeck Tested-by: Thomas Petazzoni --- arch/arm64/kernel/entry.S | 1 - arch/arm64/lib/clear_user.S | 2 +- arch/arm64/lib/copy_from_user.S | 2 +- arch/arm64/lib/copy_in_user.S | 2 +- arch/arm64/lib/copy_to_user.S | 2 +- arch/arm64/mm/cache.S | 2 +- arch/arm64/xen/hypercall.S | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index a7504f40d7ee..fb93f8c25ff0 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -31,7 +31,6 @@ #include #include #include -#include #include /* diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S index add4a1334085..d7150e30438a 100644 --- a/arch/arm64/lib/clear_user.S +++ b/arch/arm64/lib/clear_user.S @@ -17,7 +17,7 @@ */ #include -#include +#include .text diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S index fd6cd05593f9..cfe13396085b 100644 --- a/arch/arm64/lib/copy_from_user.S +++ b/arch/arm64/lib/copy_from_user.S @@ -17,7 +17,7 @@ #include #include -#include +#include /* * Copy from user space to a kernel buffer (alignment handled by the hardware) diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S index d828540ded6f..718b1c4e2f85 100644 --- a/arch/arm64/lib/copy_in_user.S +++ b/arch/arm64/lib/copy_in_user.S @@ -19,7 +19,7 @@ #include #include -#include +#include /* * Copy from user space to user space (alignment handled by the hardware) diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S index 3e6ae2663b82..e99e31c9acac 100644 --- a/arch/arm64/lib/copy_to_user.S +++ b/arch/arm64/lib/copy_to_user.S @@ -17,7 +17,7 @@ #include #include -#include +#include /* * Copy to user space from a kernel buffer (alignment handled by the hardware) diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 17f422a4dc55..da9576932322 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* * flush_icache_range(start,end) diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S index 47cf3f9d89ff..b41aff25426d 100644 --- a/arch/arm64/xen/hypercall.S +++ b/arch/arm64/xen/hypercall.S @@ -49,7 +49,7 @@ #include #include -#include +#include #include