Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0ffbf26 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent de9f4fc2

arch/m68k/include/asm/cache.h

+10 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "cache_no.h"

#else

#include "cache_mm.h"

/*

 * 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

arch/m68k/include/asm/cache_mm.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/*

 * 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

arch/m68k/include/asm/cache_no.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#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