From: Russell King Date: Wed, 2 Jan 2019 10:37:05 +0000 (+0000) Subject: Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97b6f89f7269b746b68e7985c16d2354c688d29a;p=linux.git Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus --- 97b6f89f7269b746b68e7985c16d2354c688d29a diff --cc arch/arm/include/asm/cputype.h index 0d289240b6ca1,0d289240b6ca1,f6df4bb4e543f..775cac3c02bb0 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h @@@@ -105,12 -105,12 -106,8 +105,13 @@@@ /* Qualcomm implemented cores */ #define ARM_CPU_PART_SCORPION 0x510002d0 +#ifndef __ASSEMBLY__ + +#include +#include + extern unsigned int processor_id; ++ struct proc_info_list *lookup_processor(u32 midr); #ifdef CONFIG_CPU_CP15 #define read_cpuid(reg) \