Commit 2dc2f8e0 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Kill off the special uncached section and fixmap. 



Now that cached_to_uncached works as advertized in 32-bit mode and we're
never going to be able to map < 16MB anyways, there's no need for the
special uncached section. Kill it off.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 3125ee72

arch/sh/include/asm/fixmap.h

+3 −1
Original line number Diff line number Diff line
@@ -55,11 +55,12 @@ enum fixed_addresses { 
#define FIX_N_COLOURS 8

	FIX_CMAP_BEGIN,

	FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS) - 1,

	FIX_UNCACHED,



#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



	/*

	 * FIX_IOREMAP entries are useful for mapping physical address

	 * space before ioremap() is useable, e.g. really early in boot
@@ -68,6 +69,7 @@ enum fixed_addresses { 
#define FIX_N_IOREMAPS	32

	FIX_IOREMAP_BEGIN,

	FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS,



	__end_of_fixed_addresses

};

arch/sh/include/asm/system_32.h

+0 −3
Original line number Diff line number Diff line
@@ -145,9 +145,6 @@ do { \ 
		__restore_dsp(prev);				\

} while (0)



#define __uses_jump_to_uncached \

	noinline __attribute__ ((__section__ (".uncached.text")))



/*

 * Jump to uncached area.

 * When handling TLB or caches, we need to do it from an uncached area.

arch/sh/include/asm/system_64.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ do { \ 
			      &next->thread);			\

} while (0)



#define __uses_jump_to_uncached



#define jump_to_uncached()	do { } while (0)

#define back_to_cached()	do { } while (0)

arch/sh/kernel/cpu/init.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void __init expmask_init(void) 
#endif



/* 2nd-level cache init */

void __uses_jump_to_uncached __attribute__ ((weak)) l2_cache_init(void)

void __attribute__ ((weak)) l2_cache_init(void)

{

}
@@ -106,7 +106,7 @@ void __uses_jump_to_uncached __attribute__ ((weak)) l2_cache_init(void) 
 * Generic first-level cache init

 */

#ifdef CONFIG_SUPERH32

static void __uses_jump_to_uncached cache_init(void)

static void cache_init(void)

{

	unsigned long ccr, flags;

arch/sh/kernel/cpu/sh3/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <asm/cache.h>

#include <asm/io.h>



int __uses_jump_to_uncached detect_cpu_and_cache_system(void)

int detect_cpu_and_cache_system(void)

{

	unsigned long addr0, addr1, data0, data1, data2, data3;