Commit db4f1fda authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] M68k cache mode

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Use a constant m68k_supervisor_cachemode only if we know it's safe,
otherwise use the value from head.S (from Roman Zippel)
parent 37f5c1db
...@@ -41,10 +41,14 @@ extern int m68k_pgtable_cachemode; ...@@ -41,10 +41,14 @@ extern int m68k_pgtable_cachemode;
* processors >= '040. It is used in pte_mkcache(), and the variable is * processors >= '040. It is used in pte_mkcache(), and the variable is
* defined and initialized in head.S */ * defined and initialized in head.S */
#if defined(CONFIG_060_WRITETHROUGH) #if defined(CPU_M68060_ONLY) && defined(CONFIG_060_WRITETHROUGH)
extern int m68k_supervisor_cachemode; #define m68k_supervisor_cachemode _PAGE_CACHE040W
#else #elif defined(CPU_M68040_OR_M68060_ONLY)
#define m68k_supervisor_cachemode _PAGE_CACHE040 #define m68k_supervisor_cachemode _PAGE_CACHE040
#elif defined(CPU_M68020_OR_M68030_ONLY)
#define m68k_supervisor_cachemode 0
#else
extern int m68k_supervisor_cachemode;
#endif #endif
#if defined(CPU_M68040_OR_M68060_ONLY) #if defined(CPU_M68040_OR_M68060_ONLY)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment