Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <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>

-31
-8
arch/sh/include/asm/fixmap.h
··· 13 13 #include <linux/kernel.h> 14 14 #include <linux/threads.h> 15 15 #include <asm/page.h> 16 - #ifdef CONFIG_HIGHMEM 17 - #include <asm/kmap_types.h> 18 - #endif 19 16 20 17 /* 21 18 * Here we define all the compile-time 'special' virtual ··· 49 52 #define FIX_N_COLOURS 8 50 53 FIX_CMAP_BEGIN, 51 54 FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS) - 1, 52 - 53 - #ifdef CONFIG_HIGHMEM 54 - FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ 55 - FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_TYPE_NR * NR_CPUS) - 1, 56 - #endif 57 55 58 56 #ifdef CONFIG_IOREMAP_FIXED 59 57 /*
-15
arch/sh/include/asm/kmap_types.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - #ifndef __SH_KMAP_TYPES_H 3 - #define __SH_KMAP_TYPES_H 4 - 5 - /* Dummy header just to define km_type. */ 6 - 7 - #ifdef CONFIG_DEBUG_HIGHMEM 8 - #define __WITH_KM_FENCE 9 - #endif 10 - 11 - #include <asm-generic/kmap_types.h> 12 - 13 - #undef __WITH_KM_FENCE 14 - 15 - #endif
-8
arch/sh/mm/init.c
··· 362 362 mem_init_print_info(NULL); 363 363 pr_info("virtual kernel memory layout:\n" 364 364 " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" 365 - #ifdef CONFIG_HIGHMEM 366 - " pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n" 367 - #endif 368 365 " vmalloc : 0x%08lx - 0x%08lx (%4ld MB)\n" 369 366 " lowmem : 0x%08lx - 0x%08lx (%4ld MB) (cached)\n" 370 367 #ifdef CONFIG_UNCACHED_MAPPING ··· 372 375 " .text : 0x%08lx - 0x%08lx (%4ld kB)\n", 373 376 FIXADDR_START, FIXADDR_TOP, 374 377 (FIXADDR_TOP - FIXADDR_START) >> 10, 375 - 376 - #ifdef CONFIG_HIGHMEM 377 - PKMAP_BASE, PKMAP_BASE+LAST_PKMAP*PAGE_SIZE, 378 - (LAST_PKMAP*PAGE_SIZE) >> 10, 379 - #endif 380 378 381 379 (unsigned long)VMALLOC_START, VMALLOC_END, 382 380 (VMALLOC_END - VMALLOC_START) >> 20,