lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k: use the mmu version of cache.h for m68knommu as well

Browse Source 
The non-mmu version of cache.h is almost the same as the mmu version.
Merge them.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Greg Ungerer
2009-02-06 14:34:47 +10:00
parent de9f4fc2b7
commit b0ffbf2612
3 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/m68k/include/asm/cache.h
View File

@@ -1,5 +1,11 @@
#ifdef __uClinux__ /*
#include "cache_no.h" * include/asm-m68k/cache.h
#else */
#include "cache_mm.h" #ifndef __ARCH_M68K_CACHE_H
#define __ARCH_M68K_CACHE_H
/* bytes per L1 cache line */
#define L1_CACHE_SHIFT 4
#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
#endif #endif

11
arch/m68k/include/asm/cache_mm.h
View File

@@ -1,11 +0,0 @@
/*
* include/asm-m68k/cache.h
*/
#ifndef __ARCH_M68K_CACHE_H
#define __ARCH_M68K_CACHE_H
/* bytes per L1 cache line */
#define L1_CACHE_SHIFT 4
#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
#endif

12
arch/m68k/include/asm/cache_no.h
View File

@@ -1,12 +0,0 @@
#ifndef __ARCH_M68KNOMMU_CACHE_H
#define __ARCH_M68KNOMMU_CACHE_H
/* bytes per L1 cache line */
#define L1_CACHE_BYTES 16 /* this need to be at least 1 */
/* m68k-elf-gcc 2.95.2 doesn't like these */
#define __cacheline_aligned
#define ____cacheline_aligned
#endif