From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 2/5] ARM: s3c24xx: Reference cpu_architecture as a global variable
Date: Wed, 10 Aug 2011 11:13:40 +0100 [thread overview]
Message-ID: <1312971223-28165-3-git-send-email-dave.martin@linaro.org> (raw)
In-Reply-To: <1312971223-28165-1-git-send-email-dave.martin@linaro.org>
This patch is needed for compatibility with the change of
cpu_architecture from a function to a global variable.
Since cpu_architecture is ARM-specific, also add an explicit
include for <asm/system.h> rather than relying on this being
included as a side-effect.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
arch/arm/plat-s3c24xx/cpu.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index c1fc6c6..bc118dc 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -34,6 +34,7 @@
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/cacheflush.h>
+#include <asm/system.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -221,7 +222,7 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)
iotable_init(mach_desc, size);
iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
- if (cpu_architecture() >= CPU_ARCH_ARMv5) {
+ if (cpu_architecture >= CPU_ARCH_ARMv5) {
idcode = s3c24xx_read_idcode_v5();
} else {
idcode = s3c24xx_read_idcode_v4();
--
1.7.4.1
next prev parent reply other threads:[~2011-08-10 10:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-10 10:13 [RFC PATCH 0/5] Fix Thumb-2 undef handling for mixed-arch kernels Dave Martin
2011-08-10 10:13 ` [RFC PATCH 1/5] ARM: Make cpu_alignment into a global variable Dave Martin
2011-08-10 11:38 ` Tixy
2011-08-10 10:13 ` Dave Martin [this message]
2011-08-10 10:13 ` [RFC PATCH 3/5] ARM: kprobes: Reference cpu_architecture as " Dave Martin
2011-08-10 11:43 ` Tixy
2011-08-10 10:13 ` [RFC PATCH 4/5] ARM: entry: Remove unnecessary masking when decoding Thumb-2 instructions Dave Martin
2011-08-10 10:13 ` [RFC PATCH 5/5] ARM: entry: Fix Thumb-2 undef handling for multi-CPU kernels Dave Martin
2011-08-10 11:55 ` Tixy
2011-08-11 13:04 ` Dave Martin
2011-09-01 14:52 ` Arnd Bergmann
2011-09-07 10:54 ` Dave Martin
2011-09-12 10:33 ` Dave Martin
2011-08-10 11:31 ` [RFC PATCH 0/5] Fix Thumb-2 undef handling for mixed-arch kernels Tixy
2011-08-11 13:10 ` Dave Martin
2011-08-15 23:13 ` Nicolas Pitre
2011-08-16 9:04 ` Dave Martin
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=1312971223-28165-3-git-send-email-dave.martin@linaro.org \
--to=dave.martin@linaro.org \
--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).