From patchwork Tue Sep 30 01:35:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 4999811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F05C4BEEA6 for ; Tue, 30 Sep 2014 01:38:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41CF4201FB for ; Tue, 30 Sep 2014 01:38:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 897C4201CE for ; Tue, 30 Sep 2014 01:38:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XYmNA-00041g-VA; Tue, 30 Sep 2014 01:37:00 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XYmMs-0003dU-FL for linux-arm-kernel@lists.infradead.org; Tue, 30 Sep 2014 01:36:43 +0000 Received: by mail-pa0-f43.google.com with SMTP id hz1so5422440pad.16 for ; Mon, 29 Sep 2014 18:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Nvvfc8R3EbvCS/x3nFZWp6qm7GRtvYMLl1DLvyH30jE=; b=fyHWGiaE8aZnH05dTM/ZUrtHF+/KEWsHcIi7WIGcy6vpo2AI/uRit5u4c3kp5LYLLv G83QZPo1qED/Y60wucR/pQFB9E8C50sdW+OiCDKwpPUfUH492yTcsesGe9vS7LfBDxMD gF64kYRkytBrACiAm766/ABI80mCFVBcAryiaqB1aZALKldnSSamCBaXy5yTN0qw8U1Q ZvWA4WrB9/pTBNdxDKeeuGHapFU/9618+crJcpPRdR9vTDQx2kEGxYhv82Apf8E/M4OZ 4Id2W8GbeRmEeNkRc2Qh7Igsiqa5QozGwnkKr/3Dj71YxVDDQUvOKdFvww4YkbKSpLg1 gpGg== X-Received: by 10.68.94.226 with SMTP id df2mr66472440pbb.122.1412040957622; Mon, 29 Sep 2014 18:35:57 -0700 (PDT) Received: from ld-irv-0074.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id ip3sm13486258pbc.58.2014.09.29.18.35.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Sep 2014 18:35:57 -0700 (PDT) From: Brian Norris To: Subject: [PATCH 1/5] ARM: include missing cp15.h header Date: Mon, 29 Sep 2014 18:35:26 -0700 Message-Id: <1412040930-16864-2-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412040930-16864-1-git-send-email-computersforpeace@gmail.com> References: <1412040930-16864-1-git-send-email-computersforpeace@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140929_183642_571661_88FAFC69 X-CRM114-Status: GOOD ( 10.20 ) X-Spam-Score: -0.8 (/) Cc: Brian Norris , Russell King , Linux Kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As of this commit: commit 39792c7cf3111d69dc4aa0923859d8b929e9039f ARM: 7861/1: cacheflush: consolidate single-CPU ARMv7 cache disabling code cacheflush.h now utilizes the CR_C macro from cp15.h. Let's include it. This also means several users of v7_exit_coherency_flush() no longer have to include cp15.h directly when they don't directly use any #defines from it. Signed-off-by: Brian Norris --- arch/arm/include/asm/cacheflush.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 79ecb4f34ffb..866e229d3129 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -16,6 +16,7 @@ #include #include #include +#include #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT)