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

m68k: use mmu fpu.h for non-mmu builds as well

None of the currently support m68knommu targets have an FPU.
Use the mmu version of fpu.h for all m68k.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

+19 -45
+19 -3
arch/m68k/include/asm/fpu.h
··· 1 - #ifdef __uClinux__ 2 - #include "fpu_no.h" 1 + #ifndef __M68K_FPU_H 2 + #define __M68K_FPU_H 3 + 4 + 5 + /* 6 + * MAX floating point unit state size (FSAVE/FRESTORE) 7 + */ 8 + 9 + #if defined(CONFIG_M68020) || defined(CONFIG_M68030) 10 + #define FPSTATESIZE (216) 11 + #elif defined(CONFIG_M68040) 12 + #define FPSTATESIZE (96) 13 + #elif defined(CONFIG_M68KFPU_EMU) 14 + #define FPSTATESIZE (28) 15 + #elif defined(CONFIG_M68060) 16 + #define FPSTATESIZE (12) 3 17 #else 4 - #include "fpu_mm.h" 18 + #define FPSTATESIZE (0) 5 19 #endif 20 + 21 + #endif /* __M68K_FPU_H */
-21
arch/m68k/include/asm/fpu_mm.h
··· 1 - #ifndef __M68K_FPU_H 2 - #define __M68K_FPU_H 3 - 4 - 5 - /* 6 - * MAX floating point unit state size (FSAVE/FRESTORE) 7 - */ 8 - 9 - #if defined(CONFIG_M68020) || defined(CONFIG_M68030) 10 - #define FPSTATESIZE (216) 11 - #elif defined(CONFIG_M68040) 12 - #define FPSTATESIZE (96) 13 - #elif defined(CONFIG_M68KFPU_EMU) 14 - #define FPSTATESIZE (28) 15 - #elif defined(CONFIG_M68060) 16 - #define FPSTATESIZE (12) 17 - #else 18 - #define FPSTATESIZE (0) 19 - #endif 20 - 21 - #endif /* __M68K_FPU_H */
-21
arch/m68k/include/asm/fpu_no.h
··· 1 - #ifndef __M68KNOMMU_FPU_H 2 - #define __M68KNOMMU_FPU_H 3 - 4 - 5 - /* 6 - * MAX floating point unit state size (FSAVE/FRESTORE) 7 - */ 8 - #if defined(CONFIG_M68020) || defined(CONFIG_M68030) 9 - #define FPSTATESIZE (216/sizeof(unsigned char)) 10 - #elif defined(CONFIG_M68040) 11 - #define FPSTATESIZE (96/sizeof(unsigned char)) 12 - #elif defined(CONFIG_M68KFPU_EMU) 13 - #define FPSTATESIZE (28/sizeof(unsigned char)) 14 - #elif defined(CONFIG_M68060) 15 - #define FPSTATESIZE (12/sizeof(unsigned char)) 16 - #else 17 - /* Assume no FP unit present then... */ 18 - #define FPSTATESIZE (2) /* dummy size */ 19 - #endif 20 - 21 - #endif /* __M68K_FPU_H */