Commit f6415194 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Thomas Bogendoerfer
Browse files

MIPS: cpu-features: Enable octeon_cache by cpu_type 



cpu_has_octeon_cache was tied to 0 for generic cpu-features,
whith this generic kernel built for octeon CPU won't boot.

Just enable this flag by cpu_type. It won't hurt orther platforms
because compiler will eliminate the code path on other processors.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 918d7795

arch/mips/include/asm/cpu-features.h

+18 −1
Original line number Diff line number Diff line
@@ -121,7 +121,24 @@ 
#define cpu_has_4k_cache	__opt(MIPS_CPU_4K_CACHE)

#endif

#ifndef cpu_has_octeon_cache

#define cpu_has_octeon_cache	0

#define cpu_has_octeon_cache						\

({									\

	int __res;							\

									\

	switch (current_cpu_type()) {					\

	case CPU_CAVIUM_OCTEON:						\

	case CPU_CAVIUM_OCTEON_PLUS:					\

	case CPU_CAVIUM_OCTEON2:					\

	case CPU_CAVIUM_OCTEON3:					\

		__res = 1;						\

		break;							\

									\

	default:							\

		__res = 0;						\

	}								\

									\

	__res;								\

})

#endif

/* Don't override `cpu_has_fpu' to 1 or the "nofpu" option won't work.  */

#ifndef cpu_has_fpu