From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Wed, 2 Jan 2019 10:37:05 +0000 (+0000)
Subject: Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus
X-Git-Tag: microblaze-v5.1-rc1~37^2~1
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=97b6f89f7269b746b68e7985c16d2354c688d29a

Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus
---

97b6f89f7269b746b68e7985c16d2354c688d29a
diff --cc arch/arm/include/asm/cputype.h
index 0d289240b6ca,0d289240b6ca,f6df4bb4e543..775cac3c02bb
--- 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 <linux/stringify.h>
  +#include <linux/kernel.h>
  +
   extern unsigned int processor_id;
++ struct proc_info_list *lookup_processor(u32 midr);
   
   #ifdef CONFIG_CPU_CP15
   #define read_cpuid(reg)							\