From patchwork Fri Feb 23 21:09:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10239855 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 209D460390 for ; Fri, 23 Feb 2018 21:12:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D0A1299C0 for ; Fri, 23 Feb 2018 21:12:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01AC7299C4; Fri, 23 Feb 2018 21:12:11 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A4814299C0 for ; Fri, 23 Feb 2018 21:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=F1eMQ+j6SBCLA/WlbuRfSvGtEtg1m6n0pFpkGKa69g0=; b=n3i1v6c/YJeEajP4SR5GnHUgDV Z9dehgRlBmxx9TABKSUwYWccEXZAs9m6A/Ehj4QAwK8JpfLOMU59nQonllMOF+IS5+cJTHTKB4CbH mmLYmscX6vSs0exqVAoM9lAvJ/YWITQ1MpMfFQovYnELUcyRsdgGyV6hjqGA0VhOUHVnegFVtg5eP 30BVzVOYHnN+uwtrJMaB1ozAxYjtid8iU5DpHhyKLnqE6zOGVGvdaSK+sH0/NcWXRi7MhtJKF9n55 ggYb90A0z7uBvR7bna5Gj1R2fmSvqUq4W0okNGL7ilydYNugUuVq5fhH9b16OAK41JGjG66qLKXmK Z6koA7mQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1epKdL-0003Fm-Dj; Fri, 23 Feb 2018 21:11:59 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1epKbM-00018q-H1 for linux-arm-kernel@lists.infradead.org; Fri, 23 Feb 2018 21:10:14 +0000 Received: by mail-qt0-x243.google.com with SMTP id c7so12166009qtn.3 for ; Fri, 23 Feb 2018 13:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zxD032hDEg0q3J6hg2UhWFukYFGV+9FMSco53oLWH5Y=; b=gZHGcp39R8MyfVDqfERC7Cd7HlDrxhqZBG5VrWwvypSbIPE6xdD42bcwa5MdbuNlQh yjaS3aSc+O+ewrdX2MnwGftPPEMotwj5G5HupCFd6rJHu16fkiUnf9yMvBfH0ZTBcBxx rTFevoEnPckiunTgBlTXYK7guVPecRIYrUYBKeUWSZZsElR6suWnRv4Ur0BmFabtke5c PmYlO0k6Rhjj/7e/Azqmryda0fKGod/DTf3NkfqoxFOFFCl2/+qg800/2JaCazFY0vxx 4AEdYTbP8bI6qQ74CtJZvjp83vWsrcbTDdge3HWMAHu5IP3heaNI/aw29SGRGnpXA0HP qODg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zxD032hDEg0q3J6hg2UhWFukYFGV+9FMSco53oLWH5Y=; b=IM/1xiikmpxayzYZxbZvLtHGQF6DbckiGuUoJGzP65KLJMYxay9Y6ssg5lTAsJZNFw 45BThE6iePgzfkOMR0yvz+lx1Us17ADVypVV33FPfwoEpq86nSzOq1Yi88gr4Iwqj2c9 TBLajyQu/NCLzJh364CRIRab98ZXKqxBa8ieCNMfIb0OpTc5O1oOMZ0Lq6H0SGXnm9qY hacBP/UDnxPSbe1/xn6+t3WSQJHiMzxa9HVXvfh2FNRRKPcChk2nKRU0uelC4wp/dP3L AqZ9WdP3xWSNBVN8I+81DnB7ys796grVDMoLTcvnuyHjqKfG9tvX0udDh4HGzuUvI/GJ MK3Q== X-Gm-Message-State: APf1xPBNabfOsZNpN59Th/co1d43y0BRhB9sLlFn1mRFWTSqAy6oa9PF Ipc3kfAcXs7h2IVzuzeOD2q0Lq9W X-Google-Smtp-Source: AG47ELv3lSmn5V+tYW/b2IZ5xHTVR/2pfJCI5QVWzuRVufzeXJhZDGCW+SBjGw05+ZGtIY5FyvbHAg== X-Received: by 10.237.36.170 with SMTP id t39mr4995101qtc.136.1519420184831; Fri, 23 Feb 2018 13:09:44 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id m13sm1912561qtf.31.2018.02.23.13.09.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 13:09:43 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/4] ARM: Allow this header to be included by assembly files Date: Fri, 23 Feb 2018 13:09:20 -0800 Message-Id: <20180223210923.544-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180223210923.544-1-f.fainelli@gmail.com> References: <20180223210923.544-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180223_130956_646015_317BFA7B X-CRM114-Status: GOOD ( 13.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Murzin , Florian Fainelli , Greg Kroah-Hartman , Russell King , open list , Doug Berger , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , Gregory Fong , Philippe Ombredanne , Brian Norris MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Doug Berger The constants defined in this file are equally useful in assembly and C source files. The arm64 architecture version of this file allows inclusion in both assembly and C source files, so this this commit adds that capability to the arm architecture version so that the constants don't need to be defined in multiple places. Signed-off-by: Doug Berger Signed-off-by: Florian Fainelli Tested-by: Mylène Josserand --- arch/arm/include/asm/cputype.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index cb546425da8a..e7632f536633 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h @@ -2,9 +2,6 @@ #ifndef __ASM_ARM_CPUTYPE_H #define __ASM_ARM_CPUTYPE_H -#include -#include - #define CPUID_ID 0 #define CPUID_CACHETYPE 1 #define CPUID_TCM 2 @@ -98,6 +95,11 @@ /* Qualcomm implemented cores */ #define ARM_CPU_PART_SCORPION 0x510002d0 +#ifndef __ASSEMBLY__ + +#include +#include + extern unsigned int processor_id; #ifdef CONFIG_CPU_CP15 @@ -326,4 +328,6 @@ static inline int __attribute_const__ cpuid_feature_extract_field(u32 features, #define cpuid_feature_extract(reg, field) \ cpuid_feature_extract_field(read_cpuid_ext(reg), field) +#endif /* __ASSEMBLY__ */ + #endif