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

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

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>

Greg Ungerer b0ffbf26 de9f4fc2

+10 -27
+10 -4
arch/m68k/include/asm/cache.h
··· 1 - #ifdef __uClinux__ 2 - #include "cache_no.h" 3 - #else 4 - #include "cache_mm.h" 1 + /* 2 + * include/asm-m68k/cache.h 3 + */ 4 + #ifndef __ARCH_M68K_CACHE_H 5 + #define __ARCH_M68K_CACHE_H 6 + 7 + /* bytes per L1 cache line */ 8 + #define L1_CACHE_SHIFT 4 9 + #define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) 10 + 5 11 #endif
-11
arch/m68k/include/asm/cache_mm.h
··· 1 - /* 2 - * include/asm-m68k/cache.h 3 - */ 4 - #ifndef __ARCH_M68K_CACHE_H 5 - #define __ARCH_M68K_CACHE_H 6 - 7 - /* bytes per L1 cache line */ 8 - #define L1_CACHE_SHIFT 4 9 - #define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) 10 - 11 - #endif
-12
arch/m68k/include/asm/cache_no.h
··· 1 - #ifndef __ARCH_M68KNOMMU_CACHE_H 2 - #define __ARCH_M68KNOMMU_CACHE_H 3 - 4 - /* bytes per L1 cache line */ 5 - #define L1_CACHE_BYTES 16 /* this need to be at least 1 */ 6 - 7 - /* m68k-elf-gcc 2.95.2 doesn't like these */ 8 - 9 - #define __cacheline_aligned 10 - #define ____cacheline_aligned 11 - 12 - #endif