MIPS: Netlogic: Use MIPS topology.h
commitbda4584cd9("MIPS: Support CPU topology files in sysfs") added topology related macros for all MIPS platforms and commitbbbf6d8768("MIPS: NL: Fix nlm_xlp_defconfig build error") removed most of the contents from mach-netlogic/topology.h. The netlogic specific topology is not needed anymore, we just need to setup the package field in current_cpu_data. Signed-off-by: Jayachandran C <jchandra@broadcom.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/8888/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
		
							parent
							
								
									53f676977d
								
							
						
					
					
						commit
						65fecc2725
					
				| @ -1,15 +0,0 @@ | ||||
| /*
 | ||||
|  * This file is subject to the terms and conditions of the GNU General Public | ||||
|  * License.  See the file "COPYING" in the main directory of this archive | ||||
|  * for more details. | ||||
|  * | ||||
|  * Copyright (C) 2013 Broadcom Corporation | ||||
|  */ | ||||
| #ifndef _ASM_MACH_NETLOGIC_TOPOLOGY_H | ||||
| #define _ASM_MACH_NETLOGIC_TOPOLOGY_H | ||||
| 
 | ||||
| #include <asm/mach-netlogic/multi-node.h> | ||||
| 
 | ||||
| #include <asm-generic/topology.h> | ||||
| 
 | ||||
| #endif /* _ASM_MACH_NETLOGIC_TOPOLOGY_H */ | ||||
| @ -120,6 +120,7 @@ static void nlm_init_secondary(void) | ||||
| 
 | ||||
| 	hwtid = hard_smp_processor_id(); | ||||
| 	current_cpu_data.core = hwtid / NLM_THREADS_PER_CORE; | ||||
| 	current_cpu_data.package = nlm_cpuid_to_node(hwtid); | ||||
| 	nlm_percpu_init(hwtid); | ||||
| 	nlm_smp_irq_init(hwtid); | ||||
| } | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user