diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-09 20:35:46 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-09 20:35:46 +0300 |
| commit | 6724af486903df57338c14424e02599e371cf563 (patch) | |
| tree | 0e42ae32bbfe7e93ba9db11a1124aeb4378cbd71 /arch/mips/include/asm/mach-netlogic/multi-node.h | |
| parent | d2233325e5b7891914901867ca5355347d59df14 (diff) | |
| parent | 9deef024a12ebae4965c89837f662905ac88944b (diff) | |
| download | linux-6724af486903df57338c14424e02599e371cf563.tar.xz | |
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Diffstat (limited to 'arch/mips/include/asm/mach-netlogic/multi-node.h')
| -rw-r--r-- | arch/mips/include/asm/mach-netlogic/multi-node.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/mips/include/asm/mach-netlogic/multi-node.h b/arch/mips/include/asm/mach-netlogic/multi-node.h index 9ed8dacdc37c..8bdf47e29145 100644 --- a/arch/mips/include/asm/mach-netlogic/multi-node.h +++ b/arch/mips/include/asm/mach-netlogic/multi-node.h @@ -48,15 +48,6 @@ #endif #define NLM_THREADS_PER_CORE 4 -#ifdef CONFIG_CPU_XLR -#define nlm_cores_per_node() 8 -#else -extern unsigned int xlp_cores_per_node; -#define nlm_cores_per_node() xlp_cores_per_node -#endif - -#define nlm_threads_per_node() (nlm_cores_per_node() * NLM_THREADS_PER_CORE) -#define nlm_cpuid_to_node(c) ((c) / nlm_threads_per_node()) struct nlm_soc_info { unsigned long coremask; /* cores enabled on the soc */ |