linux-kernel - Re: linux-next: manual merge of the cortex tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sun, 3 Feb 2013 00:37:21 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Christoffer Dall <c.dall@...tualopensystems.com>,
	Will Deacon <will.deacon@....com>
Subject: Re: 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@....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@...b.auug.org.au

Content of type "application/pgp-signature" skipped