From patchwork Tue Apr 28 16:45:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Rothberg X-Patchwork-Id: 6291091 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2E08F9F1C2 for ; Tue, 28 Apr 2015 16:47:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5EF2B2024F for ; Tue, 28 Apr 2015 16:47:53 +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 A1C332024C for ; Tue, 28 Apr 2015 16:47:52 +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 1Yn8e6-0004DG-J5; Tue, 28 Apr 2015 16:46:06 +0000 Received: from mail-wg0-x22f.google.com ([2a00:1450:400c:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yn8dy-00044W-MW for linux-arm-kernel@lists.infradead.org; Tue, 28 Apr 2015 16:45:59 +0000 Received: by wgin8 with SMTP id n8so726608wgi.0 for ; Tue, 28 Apr 2015 09:45:36 -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; bh=9E8wuHtTggcs1TSL/7ZtCTgdh3d//Bb2Ma0Vn7U0ZiA=; b=bsw07IcjCBmAbJHr20PGRX9krnm1J/Ij9gLlrku0E2MPyiFrJ3fdBLJyYj/VStw5t5 8+Ugd7cXrelRXBwSUfkJ0rCGlSim/P/0BDvJpdBN8TdnNaRf5cD5hJ3zlCU2pOrUPqlv aAjyBlQpyj2oEwYxaB+lWQ+v8wn+ZOVASy4tvHSHcECbDkyz9ojvFGoPrKbSQ2z2s5RH wtD6hi0Ze8TKpwZBHiwQaX+sIpuqTCdWwGtwS1PBsQoJ4vfYye5azBUlw3f2/8ZW1EdU hJG2Jb8fFgKNsLaDLvv5mt9HQNyU1+t4GWhe2WT+DMS8RPEtT1ncnXfTK1sV334b//N9 Tl3g== X-Received: by 10.180.88.72 with SMTP id be8mr922438wib.45.1430239536233; Tue, 28 Apr 2015 09:45:36 -0700 (PDT) Received: from localhost.localdomain (bob75-9-88-181-3-117.fbx.proxad.net. [88.181.3.117]) by mx.google.com with ESMTPSA id dl2sm17248331wib.2.2015.04.28.09.45.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Apr 2015 09:45:35 -0700 (PDT) From: Valentin Rothberg To: linux@arm.linux.org.uk, ard.biesheuvel@linaro.org, nico@linaro.org, nsekhar@ti.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arch/arm/mm/proc-arm925.S: remove dead #ifdef block Date: Tue, 28 Apr 2015 18:45:29 +0200 Message-Id: <1430239529-15726-1-git-send-email-valentinrothberg@gmail.com> X-Mailer: git-send-email 2.1.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150428_094558_974757_7C656FEF X-CRM114-Status: UNSURE ( 9.02 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Valentin Rothberg 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 The block could never be compiled; CPU_ICACHE_STREAMING_DISABLE has not been defined in Kconfig since the very first Git commit. Hence, we can safely remove the entire block. Signed-off-by: Valentin Rothberg --- There is a similar looking option 'CPU_ICACHE_DISABLE'. However, I decided to remove the entire block since it could not be compiled for such a long time. I detected this issue with scripts/checkkconfigsymbols.py --- arch/arm/mm/proc-arm925.S | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S index ede8c54ab4aa..32a47cc19076 100644 --- a/arch/arm/mm/proc-arm925.S +++ b/arch/arm/mm/proc-arm925.S @@ -441,9 +441,6 @@ ENTRY(cpu_arm925_set_pte_ext) .type __arm925_setup, #function __arm925_setup: mov r0, #0 -#if defined(CONFIG_CPU_ICACHE_STREAMING_DISABLE) - orr r0,r0,#1 << 7 -#endif /* Transparent on, D-cache clean & flush mode. See NOTE2 above */ orr r0,r0,#1 << 1 @ transparent mode on