Commit 673afbac authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: https://lore.kernel.org/r/20201103095856.979798613@linutronix.de
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
parent e8f147dc

arch/sh/include/asm/fixmap.h

+0 −8
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#include <linux/kernel.h>

#include <linux/threads.h>

#include <asm/page.h>

#ifdef CONFIG_HIGHMEM

#include <asm/kmap_types.h>

#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

arch/sh/include/asm/kmap_types.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/* 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 <asm-generic/kmap_types.h>



#undef __WITH_KM_FENCE



#endif

arch/sh/mm/init.c

+0 −8
Original line number Diff line number Diff line
@@ -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,