From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74085C4741F for ; Fri, 6 Nov 2020 23:27:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2186B20867 for ; Fri, 6 Nov 2020 23:27:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="p2Vd703d"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="RX1yaCEu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729072AbgKFX1i (ORCPT ); Fri, 6 Nov 2020 18:27:38 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:38434 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729011AbgKFX1a (ORCPT ); Fri, 6 Nov 2020 18:27:30 -0500 Date: Fri, 06 Nov 2020 23:27:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1604705248; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aAyL+ADOoA845ttjTbDhYkco/wC6opXX0llYwKTOTaw=; b=p2Vd703dh5lVdC4JSKHCiTwkx3ngg4AlHFgQ73PD2uycCL/8qiyeN/uF8A29OX0TiT9Px7 f/1jkTmeBaiMWbTiOqFt87ZfFbGkaDbMCKWkx81mJpwy8/HQe3pDeUO0tIRRe1YBRCLnEH Yj7zRca+oqJYQnww6grQ4FbhebX019Vh65bjRMRhBiD7WUxBXxx4ReMRCzOl2KJ5B5HQ4l oB6lu8qCwefTAqjVwV6aENFk879mlH8GTqIBhcrJemJ5FPNZQWzpe6MR9x+fgW+jMwEitX PJu/OH6BZgTmblvmezw8gO7khb5oh33bMHbf8DQ7d1pc0bOC/exdfqT74omp8Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1604705248; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aAyL+ADOoA845ttjTbDhYkco/wC6opXX0llYwKTOTaw=; b=RX1yaCEu7m4jC158K4Rwg5vZZvMOQP4K+gGuJ/+LVxdgk4J+QDkUM//tCqeG3EzfK0smM+ +R700LKkLtrIFVDw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/mm] sh/highmem: Remove all traces of unused cruft Cc: Thomas Gleixner , Andrew Morton , Yoshinori Sato , Rich Felker , Arnd Bergmann , x86 , LKML In-Reply-To: <20201103095856.979798613@linutronix.de> References: <20201103095856.979798613@linutronix.de> MIME-Version: 1.0 Message-ID: <160470524712.397.18423833305163964941.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/mm branch of tip: Commit-ID: 673afbace459ae6fd8d03bda410e0a9f10438c99 Gitweb: https://git.kernel.org/tip/673afbace459ae6fd8d03bda410e0a9f10438c99 Author: Thomas Gleixner AuthorDate: Tue, 03 Nov 2020 10:27:16 +01:00 Committer: Thomas Gleixner CommitterDate: Fri, 06 Nov 2020 23:14:54 +01:00 sh/highmem: Remove all traces of unused cruft For whatever reasons SH has highmem bits all over the place but does not enable it via Kconfig. Remove the bitrot. Signed-off-by: Thomas Gleixner Cc: Andrew Morton Link: https://lore.kernel.org/r/20201103095856.979798613@linutronix.de Cc: Yoshinori Sato Cc: Rich Felker Cc: Arnd Bergmann Cc: Andrew Morton --- arch/sh/include/asm/fixmap.h | 8 -------- arch/sh/include/asm/kmap_types.h | 15 --------------- arch/sh/mm/init.c | 8 -------- 3 files changed, 31 deletions(-) delete mode 100644 arch/sh/include/asm/kmap_types.h diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h index f38adc1..b07fbc7 100644 --- a/arch/sh/include/asm/fixmap.h +++ b/arch/sh/include/asm/fixmap.h @@ -13,9 +13,6 @@ #include #include #include -#ifdef CONFIG_HIGHMEM -#include -#endif /* * Here we define all the compile-time 'special' virtual @@ -53,11 +50,6 @@ enum fixed_addresses { FIX_CMAP_BEGIN, FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS) - 1, -#ifdef CONFIG_HIGHMEM - FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ - FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_TYPE_NR * NR_CPUS) - 1, -#endif - #ifdef CONFIG_IOREMAP_FIXED /* * FIX_IOREMAP entries are useful for mapping physical address diff --git a/arch/sh/include/asm/kmap_types.h b/arch/sh/include/asm/kmap_types.h deleted file mode 100644 index b78107f..0000000 --- a/arch/sh/include/asm/kmap_types.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SH_KMAP_TYPES_H -#define __SH_KMAP_TYPES_H - -/* Dummy header just to define km_type. */ - -#ifdef CONFIG_DEBUG_HIGHMEM -#define __WITH_KM_FENCE -#endif - -#include - -#undef __WITH_KM_FENCE - -#endif diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 3348e0c..0db6919 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -362,9 +362,6 @@ void __init mem_init(void) mem_init_print_info(NULL); pr_info("virtual kernel memory layout:\n" " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" -#ifdef CONFIG_HIGHMEM - " pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n" -#endif " vmalloc : 0x%08lx - 0x%08lx (%4ld MB)\n" " lowmem : 0x%08lx - 0x%08lx (%4ld MB) (cached)\n" #ifdef CONFIG_UNCACHED_MAPPING @@ -376,11 +373,6 @@ void __init mem_init(void) FIXADDR_START, FIXADDR_TOP, (FIXADDR_TOP - FIXADDR_START) >> 10, -#ifdef CONFIG_HIGHMEM - PKMAP_BASE, PKMAP_BASE+LAST_PKMAP*PAGE_SIZE, - (LAST_PKMAP*PAGE_SIZE) >> 10, -#endif - (unsigned long)VMALLOC_START, VMALLOC_END, (VMALLOC_END - VMALLOC_START) >> 20,