From: Russell King <rmk@arm•linux.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Christoffer Dall" <c.dall@virtualopensystems•com>,
"Will Deacon" <will.deacon@arm•com>
Subject: Re: linux-next: manual merge of the cortex tree with the arm tree
Date: Sat, 2 Feb 2013 12:21:22 +0000 [thread overview]
Message-ID: <20130202122122.GA26330@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20130202222036.0db6c1d208843975be1f8dba@canb.auug.org.au>
On Sat, Feb 02, 2013 at 10:20:36PM +1100, Stephen Rothwell wrote:
> Hi Uwe,
>
> Today's linux-next merge of the cortex tree got a conflict in
> arch/arm/include/asm/cputype.h between commit 59530adc3f1b ("ARM: Define
> CPU part numbers and implementors") from the arm tree and commit
> 6ebd4d038dbb ("ARM: stub out read_cpuid and read_cpuid_ext for
> CPU_CP15=n") from the cortex tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
It doesn't look right to me.
> 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.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2013-02-02 12:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-02 11:20 linux-next: manual merge of the cortex tree with the arm tree Stephen Rothwell
2013-02-02 12:21 ` Russell King [this message]
2013-02-02 13:37 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130202122122.GA26330@flint.arm.linux.org.uk \
--to=rmk@arm$(echo .)linux.org.uk \
--cc=c.dall@virtualopensystems$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox