From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] pxa: fix cpu_is_pxa*() not expanded to zero when not configured
Date: Tue, 7 Sep 2010 06:13:49 +0200 [thread overview]
Message-ID: <201009070613.49827.marek.vasut@gmail.com> (raw)
In-Reply-To: <AANLkTinqc=k3H0QL5PKNu6Je=qs=GBNAQ21nv5HkvGom@mail.gmail.com>
Dne ?t 7. z??? 2010 06:09:46 Eric Miao napsal(a):
> Marek,
>
> Could you give this a run?
Fixed the problem.
Tested-by: Marek Vasut <marek.vasut@gmail.com>
>
> diff --git a/arch/arm/mach-pxa/include/mach/hardware.h
> b/arch/arm/mach-pxa/include/mach/hardware.h
> index 7f64d24..b036500 100644
> --- a/arch/arm/mach-pxa/include/mach/hardware.h
> +++ b/arch/arm/mach-pxa/include/mach/hardware.h
> @@ -264,23 +264,35 @@
> * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
> * == 0x3 for pxa300/pxa310/pxa320
> */
> +#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
> #define __cpu_is_pxa2xx(id) \
> ({ \
> unsigned int _id = (id) >> 13 & 0x7; \
> _id <= 0x2; \
> })
> +#else
> +#define __cpu_is_pxa2xx(id) (0)
> +#endif
>
> +#ifdef CONFIG_PXA3xx
> #define __cpu_is_pxa3xx(id) \
> ({ \
> unsigned int _id = (id) >> 13 & 0x7; \
> _id == 0x3; \
> })
> +#else
> +#define __cpu_is_pxa3xx(id) (0)
> +#endif
>
> +#if defined(CONFIG_CPU_PXA930) || defined(CONFIG_CPU_PXA935)
> #define __cpu_is_pxa93x(id) \
> ({ \
> unsigned int _id = (id) >> 4 & 0xfff; \
> _id == 0x683 || _id == 0x693; \
> })
> +#else
> +#define __cpu_is_pxa93x(id) (0)
> +#endif
>
> #define cpu_is_pxa2xx() \
> ({ \
next prev parent reply other threads:[~2010-09-07 4:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-07 4:09 [PATCH] pxa: fix cpu_is_pxa*() not expanded to zero when not configured Eric Miao
2010-09-07 4:13 ` Marek Vasut [this message]
2010-09-07 9:35 ` Sergei Shtylyov
2010-09-07 9:48 ` Eric Miao
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=201009070613.49827.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).