lkml.org 
[lkml]   [2013]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the cortex tree with the arm tree
Hi Russell,

On Sat, 2 Feb 2013 12:21:22 +0000 Russell King <rmk@arm.linux.org.uk> wrote:
>
> > diff --cc arch/arm/include/asm/cputype.h
> > index ad41ec2,574269e..0000000
> > --- a/arch/arm/include/asm/cputype.h
> > +++ b/arch/arm/include/asm/cputype.h
> > @@@ -59,30 -60,25 +60,43 @@@ extern unsigned int processor_id
> > : "cc"); \
> > __val; \
> > })
> > - #else
> > - #define read_cpuid(reg) (processor_id)
> > - #define read_cpuid_ext(reg) 0
> > - #endif
> > +
> > + #else /* ifdef CONFIG_CPU_CP15 */
> >
> > +#define ARM_CPU_IMP_ARM 0x41
> > +#define ARM_CPU_IMP_INTEL 0x69
> > +
> > +#define ARM_CPU_PART_ARM1136 0xB360
> > +#define ARM_CPU_PART_ARM1156 0xB560
> > +#define ARM_CPU_PART_ARM1176 0xB760
> > +#define ARM_CPU_PART_ARM11MPCORE 0xB020
> > +#define ARM_CPU_PART_CORTEX_A8 0xC080
> > +#define ARM_CPU_PART_CORTEX_A9 0xC090
> > +#define ARM_CPU_PART_CORTEX_A5 0xC050
> > +#define ARM_CPU_PART_CORTEX_A15 0xC0F0
> > +#define ARM_CPU_PART_CORTEX_A7 0xC070
> > +
> > +#define ARM_CPU_XSCALE_ARCH_MASK 0xe000
> > +#define ARM_CPU_XSCALE_ARCH_V1 0x2000
> > +#define ARM_CPU_XSCALE_ARCH_V2 0x4000
> > +#define ARM_CPU_XSCALE_ARCH_V3 0x6000
> > +
>
> This stuff shouldn't be in the #else section - it's needed when
> CONFIG_CPU_CP15 is enabled and this resolution hides it in that case.

Rats! This was the automatically resolved part of the merge resolution.
I will fix it up (it caused a build failure in my arm defconfig build)
and will carry that fix as well from now on.

Thanks for letting me know.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-02-02 15:21    [W:0.037 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site