Skip to content

Commit 673afba

Browse files
committed
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 <[email protected]> Cc: Andrew Morton <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: Yoshinori Sato <[email protected]> Cc: Rich Felker <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Andrew Morton <[email protected]>
1 parent e8f147d commit 673afba

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

arch/sh/include/asm/fixmap.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
#include <linux/kernel.h>
1414
#include <linux/threads.h>
1515
#include <asm/page.h>
16-
#ifdef CONFIG_HIGHMEM
17-
#include <asm/kmap_types.h>
18-
#endif
1916

2017
/*
2118
* Here we define all the compile-time 'special' virtual
@@ -53,11 +50,6 @@ enum fixed_addresses {
5350
FIX_CMAP_BEGIN,
5451
FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS) - 1,
5552

56-
#ifdef CONFIG_HIGHMEM
57-
FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
58-
FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_TYPE_NR * NR_CPUS) - 1,
59-
#endif
60-
6153
#ifdef CONFIG_IOREMAP_FIXED
6254
/*
6355
* FIX_IOREMAP entries are useful for mapping physical address

arch/sh/include/asm/kmap_types.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

arch/sh/mm/init.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,6 @@ void __init mem_init(void)
362362
mem_init_print_info(NULL);
363363
pr_info("virtual kernel memory layout:\n"
364364
" fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
365-
#ifdef CONFIG_HIGHMEM
366-
" pkmap : 0x%08lx - 0x%08lx (%4ld kB)\n"
367-
#endif
368365
" vmalloc : 0x%08lx - 0x%08lx (%4ld MB)\n"
369366
" lowmem : 0x%08lx - 0x%08lx (%4ld MB) (cached)\n"
370367
#ifdef CONFIG_UNCACHED_MAPPING
@@ -376,11 +373,6 @@ void __init mem_init(void)
376373
FIXADDR_START, FIXADDR_TOP,
377374
(FIXADDR_TOP - FIXADDR_START) >> 10,
378375

379-
#ifdef CONFIG_HIGHMEM
380-
PKMAP_BASE, PKMAP_BASE+LAST_PKMAP*PAGE_SIZE,
381-
(LAST_PKMAP*PAGE_SIZE) >> 10,
382-
#endif
383-
384376
(unsigned long)VMALLOC_START, VMALLOC_END,
385377
(VMALLOC_END - VMALLOC_START) >> 20,
386378

0 commit comments

Comments
 (0)